( )⚙ D11361 tests: normalize the way some debug output it matched

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11361

tests: normalize the way some debug output it matched
ClosedPublic

Authored by valentin.gatienbaron on Aug 27 2021, 9:11 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc89ddef6474d: tests: normalize the way some debug output it matched

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

valentin.gatienbaron added a commit: rHGc89ddef6474d: tests: normalize the way some debug output it matched.Aug 30 2021, 6:25 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc89ddef6474d: tests: normalize the way some debug output it matched (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-debugcommands.t (3 lines)
Mtests/test-ssh-proto.t (24 lines)

Diff 30138

tests/test-debugcommands.t

Test debugpeer Test debugpeer
$ hg debugpeer ssh://user@dummy/debugrevlog $ hg debugpeer ssh://user@dummy/debugrevlog
url: ssh://user@dummy/debugrevlog url: ssh://user@dummy/debugrevlog
local: no local: no
pushable: yes pushable: yes
$ hg --debug debugpeer ssh://user@dummy/debugrevlog $ hg --debug debugpeer ssh://user@dummy/debugrevlog
running "*" "*/tests/dummyssh" 'user@dummy' 'hg -R debugrevlog serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R debugrevlog serve --stdio['"] (re)
running "*" "*\tests/dummyssh" "user@dummy" "hg -R debugrevlog serve --stdio" (glob) (windows !)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: 444 (no-rust !) remote: 444 (no-rust !)
remote: 463 (rust !) remote: 463 (rust !)
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-rust !) remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-rust !)
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,persistent-nodemap,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (rust !) remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,persistent-nodemap,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (rust !)
remote: 1 remote: 1
devel-peer-request: protocaps devel-peer-request: protocaps
devel-peer-request: caps: * bytes (glob) devel-peer-request: caps: * bytes (glob)
sending protocaps command sending protocaps command
url: ssh://user@dummy/debugrevlog url: ssh://user@dummy/debugrevlog
local: no local: no
pushable: yes pushable: yes

tests/test-ssh-proto.t

> EOF > EOF
creating ssh peer for wire protocol version 2 creating ssh peer for wire protocol version 2
Test a normal behaving server, for sanity Test a normal behaving server, for sanity
$ cd .. $ cd ..
$ hg --debug debugpeer ssh://user@dummy/server $ hg --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: 444 remote: 444
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
remote: 1 remote: 1
devel-peer-request: protocaps devel-peer-request: protocaps
$ SSHSERVERMODE=banner hg debugpeer ssh://user@dummy/server $ SSHSERVERMODE=banner hg debugpeer ssh://user@dummy/server
url: ssh://user@dummy/server url: ssh://user@dummy/server
local: no local: no
pushable: yes pushable: yes
--debug will print the banner --debug will print the banner
$ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server $ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: banner: line 0 remote: banner: line 0
remote: banner: line 1 remote: banner: line 1
remote: banner: line 2 remote: banner: line 2
remote: banner: line 3 remote: banner: line 3
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
Connecting to a <0.9.1 server that doesn't support the hello command. Connecting to a <0.9.1 server that doesn't support the hello command.
The client should refuse, as we dropped support for connecting to such The client should refuse, as we dropped support for connecting to such
servers. servers.
$ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server $ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: 0 remote: 0
remote: 1 remote: 1
abort: no suitable response from remote hg abort: no suitable response from remote hg
[255] [255]
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
o> readline() -> 444: o> readline() -> 444:
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
$ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-no-args --debug debugpeer ssh://user@dummy/server $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-no-args --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending no-args command sending no-args command
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: 0 remote: 0
remote: 444 remote: 444
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
$ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-multiple-no-args --debug debugpeer ssh://user@dummy/server $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-multiple-no-args --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending unknown1 command sending unknown1 command
sending unknown2 command sending unknown2 command
sending unknown3 command sending unknown3 command
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: 0 remote: 0
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
$ cd .. $ cd ..
$ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0003 (glob) sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: 0 remote: 0
remote: 444 remote: 444
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
o> readline() -> 4: o> readline() -> 4:
o> 443\n o> 443\n
o> readline() -> 444: o> readline() -> 444:
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
$ cd .. $ cd ..
$ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0003 (glob) sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
protocol upgraded to exp-ssh-v2-0003 protocol upgraded to exp-ssh-v2-0003
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
devel-peer-request: protocaps devel-peer-request: protocaps
devel-peer-request: caps: * bytes (glob) devel-peer-request: caps: * bytes (glob)
sending protocaps command sending protocaps command
url: ssh://user@dummy/server url: ssh://user@dummy/server
local: no local: no
pushable: yes pushable: yes
Verify the peer has capabilities Verify the peer has capabilities
$ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server
running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
sending upgrade request: * proto=exp-ssh-v2-0003 (glob) sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
protocol upgraded to exp-ssh-v2-0003 protocol upgraded to exp-ssh-v2-0003
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
devel-peer-request: protocaps devel-peer-request: protocaps