Mercurial > public > mercurial-scm > hg-stable

diff tests/test-ssh-proto.t @ 48561:04688c51f81f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchangev2: remove it As discussed on the mailing list, this is incomplete and unused with little hope of revival. Differential Revision: https://phab.mercurial-scm.org/D11954
author Rapha?l Gom?s <rgomes@octobus.net>
date Tue, 07 Dec 2021 16:44:22 +0100
parents c89ddef6474d
children a746d13987a6
line wrap: on
line diff
--- a/tests/test-ssh-proto.t	Thu Dec 30 13:25:44 2021 +0100
+++ b/tests/test-ssh-proto.t	Tue Dec 07 16:44:22 2021 +0100
@@ -7,13 +7,6 @@
   > use-persistent-nodemap = no
   > EOF
 
-  $ cat > hgrc-sshv2 << EOF
-  > %include $HGRCPATH
-  > [experimental]
-  > sshpeer.advertise-v2 = true
-  > sshserver.support-v2 = true
-  > EOF
-
 Helper function to run protocol tests against multiple protocol versions.
 This is easier than using #testcases because managing differences between
 protocols with inline conditional output is hard to read.
@@ -22,9 +15,6 @@
   >   commands=`cat -`
   >   echo 'testing ssh1'
   >   echo "${commands}" | hg --verbose debugwireproto --localssh
-  >   echo ""
-  >   echo 'testing ssh2'
-  >   echo "${commands}" | HGRCPATH=$TESTTMP/hgrc-sshv2 hg --verbose debugwireproto --localssh
   > }
 
   $ cat >> $HGRCPATH << EOF
@@ -54,9 +44,6 @@
   $ hg debugwireproto --localssh --peer ssh1 << EOF
   > EOF
   creating ssh peer for wire protocol version 1
-  $ hg debugwireproto --localssh --peer ssh2 << EOF
-  > EOF
-  creating ssh peer for wire protocol version 2
 
 Test a normal behaving server, for sanity
 
@@ -916,410 +903,6 @@
   o> readline() -> 4:
   o>     444\n
 
-Send an upgrade request to a server that doesn't support that command
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade 2e82ab3f-9ce3-4b4e-8f8c-6fd1c0e9e23a proto=irrelevant1%2Cirrelevant2\n
-  > readline
-  > raw
-  >     hello\n
-  >     between\n
-  >     pairs 81\n
-  >     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  > readline
-  > readline
-  > readline
-  > readline
-  > EOF
-  using raw connection to peer
-  i> write(77) -> 77:
-  i>     upgrade 2e82ab3f-9ce3-4b4e-8f8c-6fd1c0e9e23a proto=irrelevant1%2Cirrelevant2\n
-  o> readline() -> 2:
-  o>     0\n
-  i> write(104) -> 104:
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  o> readline() -> 4:
-  o>     444\n
-  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> readline() -> 2:
-  o>     1\n
-  o> readline() -> 1:
-  o>     \n
-
-  $ cd ..
-
-  $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
-  running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
-  sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
-  devel-peer-request: hello+between
-  devel-peer-request:   pairs: 81 bytes
-  sending hello command
-  sending between command
-  remote: 0
-  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: 1
-  devel-peer-request: protocaps
-  devel-peer-request:   caps: * bytes (glob)
-  sending protocaps command
-  url: ssh://user@dummy/server
-  local: no
-  pushable: yes
-
-Enable version 2 support on server. We need to do this in hgrc because we can't
-use --config with `hg serve --stdio`.
-
-  $ cat >> server/.hg/hgrc << EOF
-  > [experimental]
-  > sshserver.support-v2 = true
-  > EOF
-
-Send an upgrade request to a server that supports upgrade
-
-  $ cd server
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade this-is-some-token proto=exp-ssh-v2-0003\n
-  >     hello\n
-  >     between\n
-  >     pairs 81\n
-  >     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  > readline
-  > readline
-  > readline
-  > EOF
-  using raw connection to peer
-  i> write(153) -> 153:
-  i>     upgrade this-is-some-token proto=exp-ssh-v2-0003\n
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  o> readline() -> 44:
-  o>     upgraded this-is-some-token exp-ssh-v2-0003\n
-  o> readline() -> 4:
-  o>     443\n
-  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
-
-  $ cd ..
-
-  $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server
-  running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
-  sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
-  devel-peer-request: hello+between
-  devel-peer-request:   pairs: 81 bytes
-  sending hello command
-  sending between command
-  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
-  devel-peer-request: protocaps
-  devel-peer-request:   caps: * bytes (glob)
-  sending protocaps command
-  url: ssh://user@dummy/server
-  local: no
-  pushable: yes
-
-Verify the peer has capabilities
-
-  $ hg --config experimental.sshpeer.advertise-v2=true --debug debugcapabilities ssh://user@dummy/server
-  running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R server serve --stdio['"] (re)
-  sending upgrade request: * proto=exp-ssh-v2-0003 (glob)
-  devel-peer-request: hello+between
-  devel-peer-request:   pairs: 81 bytes
-  sending hello command
-  sending between command
-  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
-  devel-peer-request: protocaps
-  devel-peer-request:   caps: * bytes (glob)
-  sending protocaps command
-  Main capabilities:
-    batch
-    branchmap
-    $USUAL_BUNDLE2_CAPS$
-    changegroupsubset
-    getbundle
-    known
-    lookup
-    protocaps
-    pushkey
-    streamreqs=generaldelta,revlogv1,sparserevlog
-    unbundle=HG10GZ,HG10BZ,HG10UN
-    unbundlehash
-  Bundle2 capabilities:
-    HG20
-    bookmarks
-    changegroup
-      01
-      02
-    checkheads
-      related
-    digests
-      md5
-      sha1
-      sha512
-    error
-      abort
-      unsupportedcontent
-      pushraced
-      pushkey
-    hgtagsfnodes
-    listkeys
-    phases
-      heads
-    pushkey
-    remote-changegroup
-      http
-      https
-    stream
-      v2
-
-Command after upgrade to version 2 is processed
-
-  $ cd server
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >      upgrade this-is-some-token proto=exp-ssh-v2-0003\n
-  >      hello\n
-  >      between\n
-  >      pairs 81\n
-  >      0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  > readline
-  > readline
-  > readline
-  > raw
-  >      hello\n
-  > readline
-  > readline
-  > EOF
-  using raw connection to peer
-  i> write(153) -> 153:
-  i>     upgrade this-is-some-token proto=exp-ssh-v2-0003\n
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  o> readline() -> 44:
-  o>     upgraded this-is-some-token exp-ssh-v2-0003\n
-  o> readline() -> 4:
-  o>     443\n
-  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
-  i> write(6) -> 6:
-  i>     hello\n
-  o> readline() -> 4:
-  o>     428\n
-  o> readline() -> 428:
-  o>     capabilities: branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
-
-Multiple upgrades is not allowed
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade this-is-some-token proto=exp-ssh-v2-0003\n
-  >     hello\n
-  >     between\n
-  >     pairs 81\n
-  >     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  > readline
-  > readline
-  > readline
-  > raw
-  >     upgrade another-token proto=irrelevant\n
-  >     hello\n
-  > readline
-  > readavailable
-  > EOF
-  using raw connection to peer
-  i> write(153) -> 153:
-  i>     upgrade this-is-some-token proto=exp-ssh-v2-0003\n
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  o> readline() -> 44:
-  o>     upgraded this-is-some-token exp-ssh-v2-0003\n
-  o> readline() -> 4:
-  o>     443\n
-  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
-  i> write(45) -> 45:
-  i>     upgrade another-token proto=irrelevant\n
-  i>     hello\n
-  o> readline() -> 1:
-  o>     \n
-  e> read(-1) -> 42:
-  e>     cannot upgrade protocols multiple times\n
-  e>     -\n
-
-Malformed upgrade request line (not exactly 3 space delimited tokens)
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade\n
-  > readline
-  > EOF
-  using raw connection to peer
-  i> write(8) -> 8:
-  i>     upgrade\n
-  o> readline() -> 2:
-  o>     0\n
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade token\n
-  > readline
-  > EOF
-  using raw connection to peer
-  i> write(14) -> 14:
-  i>     upgrade token\n
-  o> readline() -> 2:
-  o>     0\n
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade token foo=bar extra-token\n
-  > readline
-  > EOF
-  using raw connection to peer
-  i> write(34) -> 34:
-  i>     upgrade token foo=bar extra-token\n
-  o> readline() -> 2:
-  o>     0\n
-
-Upgrade request to unsupported protocol is ignored
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade this-is-some-token proto=unknown1,unknown2\n
-  > readline
-  > raw
-  >     hello\n
-  > readline
-  > readline
-  > raw
-  >     between\n
-  >     pairs 81\n
-  >     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  > readline
-  > readline
-  > EOF
-  using raw connection to peer
-  i> write(51) -> 51:
-  i>     upgrade this-is-some-token proto=unknown1,unknown2\n
-  o> readline() -> 2:
-  o>     0\n
-  i> write(6) -> 6:
-  i>     hello\n
-  o> readline() -> 4:
-  o>     444\n
-  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
-  i> write(98) -> 98:
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  o> readline() -> 2:
-  o>     1\n
-  o> readline() -> 1:
-  o>     \n
-
-Upgrade request must be followed by hello + between
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade token proto=exp-ssh-v2-0003\n
-  >     invalid\n
-  > readline
-  > readavailable
-  > EOF
-  using raw connection to peer
-  i> write(44) -> 44:
-  i>     upgrade token proto=exp-ssh-v2-0003\n
-  i>     invalid\n
-  o> readline() -> 1:
-  o>     \n
-  e> read(-1) -> 46:
-  e>     malformed handshake protocol: missing hello\n
-  e>     -\n
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade token proto=exp-ssh-v2-0003\n
-  >     hello\n
-  >     invalid\n
-  > readline
-  > readavailable
-  > EOF
-  using raw connection to peer
-  i> write(50) -> 50:
-  i>     upgrade token proto=exp-ssh-v2-0003\n
-  i>     hello\n
-  i>     invalid\n
-  o> readline() -> 1:
-  o>     \n
-  e> read(-1) -> 48:
-  e>     malformed handshake protocol: missing between\n
-  e>     -\n
-
-  $ hg debugwireproto --localssh --peer raw << EOF
-  > raw
-  >     upgrade token proto=exp-ssh-v2-0003\n
-  >     hello\n
-  >     between\n
-  >     invalid\n
-  > readline
-  > readavailable
-  > EOF
-  using raw connection to peer
-  i> write(58) -> 58:
-  i>     upgrade token proto=exp-ssh-v2-0003\n
-  i>     hello\n
-  i>     between\n
-  i>     invalid\n
-  o> readline() -> 1:
-  o>     \n
-  e> read(-1) -> 49:
-  e>     malformed handshake protocol: missing pairs 81\n
-  e>     -\n
-
-Legacy commands are not exposed to version 2 of protocol
-
-TODO re-enable these once we're back to actually using v2 commands
-
-$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
-> command branches
->     nodes 0000000000000000000000000000000000000000
-> EOF
-creating ssh peer from handshake results
-sending branches command
-response:
-
-$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
-> command changegroup
->     roots 0000000000000000000000000000000000000000
-> EOF
-creating ssh peer from handshake results
-sending changegroup command
-response:
-
-$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
-> command changegroupsubset
->     bases 0000000000000000000000000000000000000000
->     heads 0000000000000000000000000000000000000000
-> EOF
-creating ssh peer from handshake results
-sending changegroupsubset command
-response:
-
   $ cd ..
 
 Test listkeys for listing namespaces
@@ -1364,41 +947,6 @@
     b'namespaces': b'',
     b'phases': b''
   }
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(13) -> 13:
-  i>     namespace 10\n
-  i> write(10) -> 10: namespaces
-  i> flush() -> None
-  o> bufferedreadline() -> 3:
-  o>     30\n
-  o> bufferedread(30) -> 30:
-  o>     bookmarks\t\n
-  o>     namespaces\t\n
-  o>     phases\t
-  response: {
-    b'bookmarks': b'',
-    b'namespaces': b'',
-    b'phases': b''
-  }
 
   $ cd ..
 
@@ -1444,33 +992,6 @@
   o> bufferedreadline() -> 2:
   o>     0\n
   response: {}
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(12) -> 12:
-  i>     namespace 9\n
-  i> write(9) -> 9: bookmarks
-  i> flush() -> None
-  o> bufferedreadline() -> 2:
-  o>     0\n
-  response: {}
 
 With a single bookmark set
 
@@ -1508,36 +1029,6 @@
   response: {
     b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'
   }
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(12) -> 12:
-  i>     namespace 9\n
-  i> write(9) -> 9: bookmarks
-  i> flush() -> None
-  o> bufferedreadline() -> 3:
-  o>     46\n
-  o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f
-  response: {
-    b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'
-  }
 
 With multiple bookmarks set
 
@@ -1578,39 +1069,6 @@
     b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f',
     b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'
   }
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(12) -> 12:
-  i>     namespace 9\n
-  i> write(9) -> 9: bookmarks
-  i> flush() -> None
-  o> bufferedreadline() -> 3:
-  o>     93\n
-  o> bufferedread(93) -> 93:
-  o>     bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n
-  o>     bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d
-  response: {
-    b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f',
-    b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'
-  }
 
 Test pushkey for bookmarks
 
@@ -1657,43 +1115,6 @@
   o> bufferedread(2) -> 2:
   o>     1\n
   response: True
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending pushkey command
-  i> write(8) -> 8:
-  i>     pushkey\n
-  i> write(6) -> 6:
-  i>     key 6\n
-  i> write(6) -> 6: remote
-  i> write(12) -> 12:
-  i>     namespace 9\n
-  i> write(9) -> 9: bookmarks
-  i> write(7) -> 7:
-  i>     new 40\n
-  i> write(40) -> 40: 68986213bd4485ea51533535e3fc9e78007a711f
-  i> write(6) -> 6:
-  i>     old 0\n
-  i> flush() -> None
-  o> bufferedreadline() -> 2:
-  o>     2\n
-  o> bufferedread(2) -> 2:
-  o>     1\n
-  response: True
 
   $ hg bookmarks
      bookA                     0:68986213bd44
@@ -1742,36 +1163,6 @@
   response: {
     b'publishing': b'True'
   }
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(12) -> 12:
-  i>     namespace 6\n
-  i> write(6) -> 6: phases
-  i> flush() -> None
-  o> bufferedreadline() -> 3:
-  o>     15\n
-  o> bufferedread(15) -> 15: publishing\tTrue
-  response: {
-    b'publishing': b'True'
-  }
 
 Create some commits
 
@@ -1830,41 +1221,6 @@
     b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
     b'publishing': b'True'
   }
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(12) -> 12:
-  i>     namespace 6\n
-  i> write(6) -> 6: phases
-  i> flush() -> None
-  o> bufferedreadline() -> 4:
-  o>     101\n
-  o> bufferedread(101) -> 101:
-  o>     20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n
-  o>     c4750011d906c18ea2f0527419cbc1a544435150\t1\n
-  o>     publishing\tTrue
-  response: {
-    b'20b8a89289d80036e6c4e87c2083e3bea1586637': b'1',
-    b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
-    b'publishing': b'True'
-  }
 
 Single draft head
 
@@ -1905,39 +1261,6 @@
     b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
     b'publishing': b'True'
   }
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(12) -> 12:
-  i>     namespace 6\n
-  i> write(6) -> 6: phases
-  i> flush() -> None
-  o> bufferedreadline() -> 3:
-  o>     58\n
-  o> bufferedread(58) -> 58:
-  o>     c4750011d906c18ea2f0527419cbc1a544435150\t1\n
-  o>     publishing\tTrue
-  response: {
-    b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
-    b'publishing': b'True'
-  }
 
 All public heads
 
@@ -1975,36 +1298,6 @@
   response: {
     b'publishing': b'True'
   }
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending listkeys command
-  i> write(9) -> 9:
-  i>     listkeys\n
-  i> write(12) -> 12:
-  i>     namespace 6\n
-  i> write(6) -> 6: phases
-  i> flush() -> None
-  o> bufferedreadline() -> 3:
-  o>     15\n
-  o> bufferedread(15) -> 15: publishing\tTrue
-  response: {
-    b'publishing': b'True'
-  }
 
 Setting public phase via pushkey
 
@@ -2054,44 +1347,6 @@
   o> bufferedread(2) -> 2:
   o>     1\n
   response: True
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending pushkey command
-  i> write(8) -> 8:
-  i>     pushkey\n
-  i> write(7) -> 7:
-  i>     key 40\n
-  i> write(40) -> 40: 7127240a084fd9dc86fe8d1f98e26229161ec82b
-  i> write(12) -> 12:
-  i>     namespace 6\n
-  i> write(6) -> 6: phases
-  i> write(6) -> 6:
-  i>     new 1\n
-  i> write(1) -> 1: 0
-  i> write(6) -> 6:
-  i>     old 1\n
-  i> write(1) -> 1: 1
-  i> flush() -> None
-  o> bufferedreadline() -> 2:
-  o>     2\n
-  o> bufferedread(2) -> 2:
-  o>     1\n
-  response: True
 
   $ hg phase .
   4: public
@@ -2160,40 +1415,3 @@
   response #0: bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
   response #1: bookA\t4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\nbookB\tbfebe6bd38eebc6f8202e419c1171268987ea6a6
   response #2: 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\t1\nbfebe6bd38eebc6f8202e419c1171268987ea6a6\t1\npublishing\tTrue
-  
-  testing ssh2
-  creating ssh peer from handshake results
-  i> write(171) -> 171:
-  i>     upgrade * proto=exp-ssh-v2-0003\n (glob)
-  i>     hello\n
-  i>     between\n
-  i>     pairs 81\n
-  i>     0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
-  i> flush() -> None
-  o> readline() -> 62:
-  o>     upgraded * exp-ssh-v2-0003\n (glob)
-  o> readline() -> 4:
-  o>     443\n
-  o> read(443) -> 443: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
-  o> read(1) -> 1:
-  o>     \n
-  sending batch with 3 sub-commands
-  i> write(6) -> 6:
-  i>     batch\n
-  i> write(4) -> 4:
-  i>     * 0\n
-  i> write(8) -> 8:
-  i>     cmds 61\n
-  i> write(61) -> 61: heads ;listkeys namespace=bookmarks;listkeys namespace=phases
-  i> flush() -> None
-  o> bufferedreadline() -> 4:
-  o>     278\n
-  o> bufferedread(278) -> 278:
-  o>     bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
-  o>     ;bookA\t4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
-  o>     bookB\tbfebe6bd38eebc6f8202e419c1171268987ea6a6;4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\t1\n
-  o>     bfebe6bd38eebc6f8202e419c1171268987ea6a6\t1\n
-  o>     publishing\tTrue
-  response #0: bfebe6bd38eebc6f8202e419c1171268987ea6a6 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\n
-  response #1: bookA\t4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\nbookB\tbfebe6bd38eebc6f8202e419c1171268987ea6a6
-  response #2: 4ee3fcef1c800fa2bf23e20af7c83ff111d9c7ab\t1\nbfebe6bd38eebc6f8202e419c1171268987ea6a6\t1\npublishing\tTrue