comparison tests/test-ssh-proto.t @ 47923:c89ddef6474d

tests: normalize the way some debug output it matched Differential Revision: https://phab.mercurial-scm.org/D11361
author Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
date Fri, 27 Aug 2021 09:09:10 -0400
parents 0c92cd9286ee
children 04688c51f81f
comparison
equal deleted inserted replaced
47922:e5efbb11e185 47923:c89ddef6474d
61 Test a normal behaving server, for sanity 61 Test a normal behaving server, for sanity
62 62
63 $ cd .. 63 $ cd ..
64 64
65 $ hg --debug debugpeer ssh://user@dummy/server 65 $ hg --debug debugpeer ssh://user@dummy/server
66 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 66 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
67 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
68 devel-peer-request: hello+between 67 devel-peer-request: hello+between
69 devel-peer-request: pairs: 81 bytes 68 devel-peer-request: pairs: 81 bytes
70 sending hello command 69 sending hello command
71 sending between command 70 sending between command
72 remote: 444 71 remote: 444
174 pushable: yes 173 pushable: yes
175 174
176 --debug will print the banner 175 --debug will print the banner
177 176
178 $ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server 177 $ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server
179 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 178 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
180 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
181 devel-peer-request: hello+between 179 devel-peer-request: hello+between
182 devel-peer-request: pairs: 81 bytes 180 devel-peer-request: pairs: 81 bytes
183 sending hello command 181 sending hello command
184 sending between command 182 sending between command
185 remote: banner: line 0 183 remote: banner: line 0
265 Connecting to a <0.9.1 server that doesn't support the hello command. 263 Connecting to a <0.9.1 server that doesn't support the hello command.
266 The client should refuse, as we dropped support for connecting to such 264 The client should refuse, as we dropped support for connecting to such
267 servers. 265 servers.
268 266
269 $ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server 267 $ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server
270 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 268 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
271 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
272 devel-peer-request: hello+between 269 devel-peer-request: hello+between
273 devel-peer-request: pairs: 81 bytes 270 devel-peer-request: pairs: 81 bytes
274 sending hello command 271 sending hello command
275 sending between command 272 sending between command
276 remote: 0 273 remote: 0
311 o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n 308 o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
312 o> readline() -> 2: 309 o> readline() -> 2:
313 o> 1\n 310 o> 1\n
314 311
315 $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-no-args --debug debugpeer ssh://user@dummy/server 312 $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-no-args --debug debugpeer ssh://user@dummy/server
316 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 313 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
317 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
318 sending no-args command 314 sending no-args command
319 devel-peer-request: hello+between 315 devel-peer-request: hello+between
320 devel-peer-request: pairs: 81 bytes 316 devel-peer-request: pairs: 81 bytes
321 sending hello command 317 sending hello command
322 sending between command 318 sending between command
381 o> 1\n 377 o> 1\n
382 o> readline() -> 1: 378 o> readline() -> 1:
383 o> \n 379 o> \n
384 380
385 $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-multiple-no-args --debug debugpeer ssh://user@dummy/server 381 $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-multiple-no-args --debug debugpeer ssh://user@dummy/server
386 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 382 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
387 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
388 sending unknown1 command 383 sending unknown1 command
389 sending unknown2 command 384 sending unknown2 command
390 sending unknown3 command 385 sending unknown3 command
391 devel-peer-request: hello+between 386 devel-peer-request: hello+between
392 devel-peer-request: pairs: 81 bytes 387 devel-peer-request: pairs: 81 bytes
957 o> \n 952 o> \n
958 953
959 $ cd .. 954 $ cd ..
960 955
961 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server 956 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
962 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 957 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
963 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
964 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) 958 sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
965 devel-peer-request: hello+between 959 devel-peer-request: hello+between
966 devel-peer-request: pairs: 81 bytes 960 devel-peer-request: pairs: 81 bytes
967 sending hello command 961 sending hello command
968 sending between command 962 sending between command
1015 o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n 1009 o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
1016 1010
1017 $ cd .. 1011 $ cd ..
1018 1012
1019 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server 1013 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
1020 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 1014 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
1021 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1022 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) 1015 sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
1023 devel-peer-request: hello+between 1016 devel-peer-request: hello+between
1024 devel-peer-request: pairs: 81 bytes 1017 devel-peer-request: pairs: 81 bytes
1025 sending hello command 1018 sending hello command
1026 sending between command 1019 sending between command
1034 pushable: yes 1027 pushable: yes
1035 1028
1036 Verify the peer has capabilities 1029 Verify the peer has capabilities
1037 1030
1038 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server 1031 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server
1039 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 1032 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
1040 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1041 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) 1033 sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
1042 devel-peer-request: hello+between 1034 devel-peer-request: hello+between
1043 devel-peer-request: pairs: 81 bytes 1035 devel-peer-request: pairs: 81 bytes
1044 sending hello command 1036 sending hello command
1045 sending between command 1037 sending between command