Mercurial > hg

comparison tests/test-ssh-proto.t @ 37813:58bbd14b0c62 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sshpeer: reflect actual command activity one handshake The output from devel-peer-request is expected to give data about request and roundtrip done to the server. Changeset a9cffd14aa04 changed some of that by grouping hello and between commands call. However, the old sequence of command was "emulated" in sshpeer. Update the sshpeer to reflect this grouping of commands and update the tests that use it.
author Boris Feld <boris.feld@octobus.net>
date Mon, 23 Apr 2018 19:23:18 +0100
parents fe8c6f9f2914
children 538e850ae737
comparison
equal deleted inserted replaced
37812:91b717e2cafa 37813:58bbd14b0c62
56 $ cd .. 56 $ cd ..
57 57
58 $ hg --debug debugpeer ssh://user@dummy/server 58 $ hg --debug debugpeer ssh://user@dummy/server
59 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 59 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
60 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 60 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
61 devel-peer-request: hello 61 devel-peer-request: hello+between
62 devel-peer-request: pairs: 81 bytes
62 sending hello command 63 sending hello command
63 devel-peer-request: between
64 devel-peer-request: pairs: 81 bytes
65 sending between command 64 sending between command
66 remote: 413 65 remote: 413
67 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash 66 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
68 remote: 1 67 remote: 1
69 devel-peer-request: protocaps 68 devel-peer-request: protocaps
168 --debug will print the banner 167 --debug will print the banner
169 168
170 $ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server 169 $ SSHSERVERMODE=banner hg --debug debugpeer ssh://user@dummy/server
171 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 170 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
172 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 171 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
173 devel-peer-request: hello 172 devel-peer-request: hello+between
173 devel-peer-request: pairs: 81 bytes
174 sending hello command 174 sending hello command
175 devel-peer-request: between
176 devel-peer-request: pairs: 81 bytes
177 sending between command 175 sending between command
178 remote: banner: line 0 176 remote: banner: line 0
179 remote: banner: line 1 177 remote: banner: line 1
180 remote: banner: line 2 178 remote: banner: line 2
181 remote: banner: line 3 179 remote: banner: line 3
260 servers. 258 servers.
261 259
262 $ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server 260 $ SSHSERVERMODE=no-hello hg --debug debugpeer ssh://user@dummy/server
263 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 261 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
264 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 262 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
265 devel-peer-request: hello 263 devel-peer-request: hello+between
264 devel-peer-request: pairs: 81 bytes
266 sending hello command 265 sending hello command
267 devel-peer-request: between
268 devel-peer-request: pairs: 81 bytes
269 sending between command 266 sending between command
270 remote: 0 267 remote: 0
271 remote: 1 268 remote: 1
272 abort: no suitable response from remote hg! 269 abort: no suitable response from remote hg!
273 [255] 270 [255]
308 305
309 $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-no-args --debug debugpeer ssh://user@dummy/server 306 $ hg --config sshpeer.mode=extra-handshake-commands --config sshpeer.handshake-mode=pre-no-args --debug debugpeer ssh://user@dummy/server
310 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 307 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
311 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 308 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
312 sending no-args command 309 sending no-args command
313 devel-peer-request: hello 310 devel-peer-request: hello+between
311 devel-peer-request: pairs: 81 bytes
314 sending hello command 312 sending hello command
315 devel-peer-request: between
316 devel-peer-request: pairs: 81 bytes
317 sending between command 313 sending between command
318 remote: 0 314 remote: 0
319 remote: 413 315 remote: 413
320 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash 316 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
321 remote: 1 317 remote: 1
381 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 377 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
382 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 378 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
383 sending unknown1 command 379 sending unknown1 command
384 sending unknown2 command 380 sending unknown2 command
385 sending unknown3 command 381 sending unknown3 command
386 devel-peer-request: hello 382 devel-peer-request: hello+between
383 devel-peer-request: pairs: 81 bytes
387 sending hello command 384 sending hello command
388 devel-peer-request: between
389 devel-peer-request: pairs: 81 bytes
390 sending between command 385 sending between command
391 remote: 0 386 remote: 0
392 remote: 0 387 remote: 0
393 remote: 0 388 remote: 0
394 remote: 413 389 remote: 413
956 951
957 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server 952 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
958 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 953 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
959 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 954 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
960 sending upgrade request: * proto=exp-ssh-v2-0001 (glob) 955 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
961 devel-peer-request: hello 956 devel-peer-request: hello+between
957 devel-peer-request: pairs: 81 bytes
962 sending hello command 958 sending hello command
963 devel-peer-request: between
964 devel-peer-request: pairs: 81 bytes
965 sending between command 959 sending between command
966 remote: 0 960 remote: 0
967 remote: 413 961 remote: 413
968 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash 962 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
969 remote: 1 963 remote: 1
1015 1009
1016 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server 1010 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
1017 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 1011 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
1018 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 1012 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1019 sending upgrade request: * proto=exp-ssh-v2-0001 (glob) 1013 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
1020 devel-peer-request: hello 1014 devel-peer-request: hello+between
1015 devel-peer-request: pairs: 81 bytes
1021 sending hello command 1016 sending hello command
1022 devel-peer-request: between
1023 devel-peer-request: pairs: 81 bytes
1024 sending between command 1017 sending between command
1025 protocol upgraded to exp-ssh-v2-0001 1018 protocol upgraded to exp-ssh-v2-0001
1026 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash 1019 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
1027 devel-peer-request: protocaps 1020 devel-peer-request: protocaps
1028 devel-peer-request: caps: * bytes (glob) 1021 devel-peer-request: caps: * bytes (glob)
1035 1028
1036 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server 1029 $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server
1037 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) 1030 running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !)
1038 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) 1031 running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !)
1039 sending upgrade request: * proto=exp-ssh-v2-0001 (glob) 1032 sending upgrade request: * proto=exp-ssh-v2-0001 (glob)
1040 devel-peer-request: hello 1033 devel-peer-request: hello+between
1034 devel-peer-request: pairs: 81 bytes
1041 sending hello command 1035 sending hello command
1042 devel-peer-request: between
1043 devel-peer-request: pairs: 81 bytes
1044 sending between command 1036 sending between command
1045 protocol upgraded to exp-ssh-v2-0001 1037 protocol upgraded to exp-ssh-v2-0001
1046 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash 1038 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
1047 devel-peer-request: protocaps 1039 devel-peer-request: protocaps
1048 devel-peer-request: caps: * bytes (glob) 1040 devel-peer-request: caps: * bytes (glob)