This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3733

tests: suppress read(-1) -> '' calls in fileobjectobserver
ClosedPublic

Authored by durin42 on Jun 14 2018, 12:11 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG565074cc9ac6: tests: suppress read(-1) -> '' calls in fileobjectobserver
Summary

This stabilizes the test output of the low-level wireproto tests
between Python 2 and 3. I don't feel great about this change, but
otherwise we get a ton of extra read(-1) output on Python 3, and this
feels like a more sustainable solution.

Bonus: test-ssh-proto-unbundle.t now passes on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Jun 14 2018, 12:11 PM
durin42 added a subscriber: indygreg.Jun 14 2018, 12:12 PM

@indygreg I'm not sure if this undermines your testing strategy at all, but if it does we can try and figure out another path forward...

Closed by commit rHG565074cc9ac6: tests: suppress read(-1) -> '' calls in fileobjectobserver (authored by durin42). · Explain WhyJun 15 2018, 8:48 AM
This revision was automatically updated to reflect the committed changes.
indygreg added a comment.Jun 16 2018, 1:34 PM

So Python 3 is performing a lot more read(-1) calls than Python 2? That, uh, seems weird and might be worth investigating.

Hiding the read() calls does undermine the tests somewhat. But it's not a deal breaker. Let's keep this commit and keep this excessive read(-1) issue in the back of our heads.

Revision Contents
Changeset List

Diff 9058

contrib/python3-whitelist

test-sparse-import.t test-sparse-import.t
test-sparse-merges.t test-sparse-merges.t
test-sparse-profiles.t test-sparse-profiles.t
test-sparse-requirement.t test-sparse-requirement.t
test-sparse-verbose-json.t test-sparse-verbose-json.t
test-sparse.t test-sparse.t
test-split.t test-split.t
test-ssh-clone-r.t test-ssh-clone-r.t
test-ssh-proto-unbundle.t
test-ssh-proto.t test-ssh-proto.t
test-sshserver.py test-sshserver.py
test-stack.t test-stack.t
test-status-inprocess.py test-status-inprocess.py
test-status-rev.t test-status-rev.t
test-status-terse.t test-status-terse.t
test-strict.t test-strict.t
test-strip-cross.t test-strip-cross.t

mercurial/util.py

def read(self, res, size=-1): def read(self, res, size=-1):
if not self.reads: if not self.reads:
return return
# Python 3 can return None from reads at EOF instead of empty strings. # Python 3 can return None from reads at EOF instead of empty strings.
if res is None: if res is None:
res = '' res = ''
if size == -1 and res == '':
# Suppress pointless read(-1) calls that return
# nothing. These happen _a lot_ on Python 3, and there
# doesn't seem to be a better workaround to have matching
# Python 2 and 3 behavior. :(
return
if self.logdataapis: if self.logdataapis:
self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res))) self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res)))
self._writedata(res) self._writedata(res)
def readline(self, res, limit=-1): def readline(self, res, limit=-1):
if not self.reads: if not self.reads:
return return

tests/test-ssh-proto-unbundle.t

i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 115: e> read(-1) -> 115:
e> abort: incompatible Mercurial client; bundle2 required\n e> abort: incompatible Mercurial client; bundle2 required\n
e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 115: e> read(-1) -> 115:
e> abort: incompatible Mercurial client; bundle2 required\n e> abort: incompatible Mercurial client; bundle2 required\n
e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n
$ cd .. $ cd ..
Create a pretxnchangegroup hook that fails. Give it multiple modes of printing Create a pretxnchangegroup hook that fails. Give it multiple modes of printing
output so we can test I/O capture and behavior. output so we can test I/O capture and behavior.
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 196: e> read(-1) -> 196:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1 line\n e> ui.write 1 line\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 196: e> read(-1) -> 196:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1 line\n e> ui.write 1 line\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 218: e> read(-1) -> 218:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 2 lines 1\n e> ui.write 2 lines 1\n
e> ui.write 2 lines 2\n e> ui.write 2 lines 2\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 218: e> read(-1) -> 218:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 2 lines 1\n e> ui.write 2 lines 1\n
e> ui.write 2 lines 2\n e> ui.write 2 lines 2\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 202: e> read(-1) -> 202:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1 line flush\n e> ui.write 1 line flush\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 202: e> read(-1) -> 202:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1 line flush\n e> ui.write 1 line flush\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 206: e> read(-1) -> 206:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1st\n e> ui.write 1st\n
e> ui.write 2nd\n e> ui.write 2nd\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 206: e> read(-1) -> 206:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1st\n e> ui.write 1st\n
e> ui.write 2nd\n e> ui.write 2nd\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 232: e> read(-1) -> 232:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1\n e> ui.write 1\n
e> ui.write_err 1\n e> ui.write_err 1\n
e> ui.write 2\n e> ui.write 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 232: e> read(-1) -> 232:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1\n e> ui.write 1\n
e> ui.write_err 1\n e> ui.write_err 1\n
e> ui.write 2\n e> ui.write 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 193: e> read(-1) -> 193:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> printed line\n e> printed line\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 193: e> read(-1) -> 193:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> printed line\n e> printed line\n
e> transaction abort!\n e> transaction abort!\n
e> rollback completed\n e> rollback completed\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 218: e> read(-1) -> 218:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> print 1\n e> print 1\n
e> ui.write 1\n e> ui.write 1\n
e> print 2\n e> print 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 218: e> read(-1) -> 218:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> print 1\n e> print 1\n
e> ui.write 1\n e> ui.write 1\n
e> print 2\n e> print 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 216: e> read(-1) -> 216:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n e> stdout 1\n
e> stderr 1\n e> stderr 1\n
e> stdout 2\n e> stdout 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 216: e> read(-1) -> 216:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n e> stdout 1\n
e> stderr 1\n e> stderr 1\n
e> stdout 2\n e> stdout 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 212: e> read(-1) -> 212:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n e> stdout 1\n
e> stdout 2\n e> stdout 2\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 212: e> read(-1) -> 212:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n e> stdout 1\n
e> stdout 2\n e> stdout 2\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 212: e> read(-1) -> 212:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stderr 1\n e> stderr 1\n
e> stderr 2\n e> stderr 2\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 212: e> read(-1) -> 212:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stderr 1\n e> stderr 1\n
e> stderr 2\n e> stderr 2\n
e> transaction abort!\n e> transaction abort!\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 230: e> read(-1) -> 230:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n e> stdout 1\n
e> stderr 1\n e> stderr 1\n
e> stdout 2\n e> stdout 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 230: e> read(-1) -> 230:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> stdout 1\n e> stdout 1\n
e> stderr 1\n e> stderr 1\n
e> stdout 2\n e> stdout 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 273: e> read(-1) -> 273:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> shell stdout 1\n e> shell stdout 1\n
e> shell stderr 1\n e> shell stderr 1\n
e> shell stdout 2\n e> shell stdout 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 0 o> read(1) -> 1: 0
result: 0 result: 0
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 273: e> read(-1) -> 273:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> shell stdout 1\n e> shell stdout 1\n
e> shell stderr 1\n e> shell stderr 1\n
e> shell stdout 2\n e> shell stdout 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 1 o> read(1) -> 1: 1
result: 1 result: 1
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 100: e> read(-1) -> 100:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 1 o> read(1) -> 1: 1
result: 1 result: 1
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 100: e> read(-1) -> 100:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
$ cd .. $ cd ..
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 1 o> read(1) -> 1: 1
result: 1 result: 1
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 152: e> read(-1) -> 152:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1\n e> ui.write 1\n
e> ui.write_err 1\n e> ui.write_err 1\n
e> ui.write 2\n e> ui.write 2\n
i> flush() -> None i> flush() -> None
o> readline() -> 2: o> readline() -> 2:
o> 0\n o> 0\n
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> read(1) -> 1: 1 o> read(1) -> 1: 1
result: 1 result: 1
remote output: remote output:
o> read(-1) -> 0:
e> read(-1) -> 152: e> read(-1) -> 152:
e> adding changesets\n e> adding changesets\n
e> adding manifests\n e> adding manifests\n
e> adding file changes\n e> adding file changes\n
e> added 1 changesets with 1 changes to 1 files\n e> added 1 changesets with 1 changes to 1 files\n
e> ui.write 1\n e> ui.write 1\n
e> ui.write_err 1\n e> ui.write_err 1\n
e> ui.write 2\n e> ui.write 2\n
e> ui.write_err 2\n e> ui.write_err 2\n

tests/test-ssh-proto.t

o> 412\n o> 412\n
o> readline() -> 413: o> readline() -> 413:
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
i> write(45) -> 45: i> write(45) -> 45:
i> upgrade another-token proto=irrelevant\n i> upgrade another-token proto=irrelevant\n
i> hello\n i> hello\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
o> read(-1) -> 0:
e> read(-1) -> 42: e> read(-1) -> 42:
e> cannot upgrade protocols multiple times\n e> cannot upgrade protocols multiple times\n
e> -\n e> -\n
Malformed upgrade request line (not exactly 3 space delimited tokens) Malformed upgrade request line (not exactly 3 space delimited tokens)
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> readavailable > readavailable
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(44) -> 44: i> write(44) -> 44:
i> upgrade token proto=exp-ssh-v2-0001\n i> upgrade token proto=exp-ssh-v2-0001\n
i> invalid\n i> invalid\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
o> read(-1) -> 0:
e> read(-1) -> 46: e> read(-1) -> 46:
e> malformed handshake protocol: missing hello\n e> malformed handshake protocol: missing hello\n
e> -\n e> -\n
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade token proto=exp-ssh-v2-0001\n > upgrade token proto=exp-ssh-v2-0001\n
> hello\n > hello\n
> invalid\n > invalid\n
> readline > readline
> readavailable > readavailable
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(50) -> 50: i> write(50) -> 50:
i> upgrade token proto=exp-ssh-v2-0001\n i> upgrade token proto=exp-ssh-v2-0001\n
i> hello\n i> hello\n
i> invalid\n i> invalid\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
o> read(-1) -> 0:
e> read(-1) -> 48: e> read(-1) -> 48:
e> malformed handshake protocol: missing between\n e> malformed handshake protocol: missing between\n
e> -\n e> -\n
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade token proto=exp-ssh-v2-0001\n > upgrade token proto=exp-ssh-v2-0001\n
> hello\n > hello\n
> between\n > between\n
> invalid\n > invalid\n
> readline > readline
> readavailable > readavailable
> EOF > EOF
using raw connection to peer using raw connection to peer
i> write(58) -> 58: i> write(58) -> 58:
i> upgrade token proto=exp-ssh-v2-0001\n i> upgrade token proto=exp-ssh-v2-0001\n
i> hello\n i> hello\n
i> between\n i> between\n
i> invalid\n i> invalid\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
o> read(-1) -> 0:
e> read(-1) -> 49: e> read(-1) -> 49:
e> malformed handshake protocol: missing pairs 81\n e> malformed handshake protocol: missing pairs 81\n
e> -\n e> -\n
Legacy commands are not exposed to version 2 of protocol Legacy commands are not exposed to version 2 of protocol
TODO re-enable these once we're back to actually using v2 commands TODO re-enable these once we're back to actually using v2 commands