Mercurial > hg
changeset 36608:1151c731686e
sshpeer: don't read from stderr when that behavior is disabled
We previously prevented the creation of doublepipe instances when
we're not supposed to automatically read from stderr. However,
there were other automatic calls to read from stderr that were
undermining this effort.
This commit prevents all automatic reads from stderr from occurring
when they are supposed to be disabled.
Because stderr is no longer being read, we need to call "readavailable"
from tests so stderr is read from.
Test output changes because stderr is now always (manually) read after
stdout. And, since sshpeer no longer automatically tends to stderr,
no "remote: " messages are printed. This should fix non-deterministic
test output.
FWIW, doublepipe automatically reads from stderr when reading from
stdout, so I'm not sure some of these calls to self._readerr() are
even needed.
Differential Revision: https://phab.mercurial-scm.org/D2571
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 02 Mar 2018 18:50:49 -0500 |
| parents | c6061cadb400 |
| children | abc3b9801563 |
| files | mercurial/sshpeer.py tests/test-ssh-proto-unbundle.t |
| diffstat | 2 files changed, 142 insertions(+), 305 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/sshpeer.py Thu Feb 15 17:18:26 2018 +0100 +++ b/mercurial/sshpeer.py Fri Mar 02 18:50:49 2018 -0500 @@ -365,6 +365,7 @@ self._pipei = stdout self._pipee = stderr self._caps = caps + self._autoreadstderr = autoreadstderr # Commands that have a "framed" response where the first line of the # response contains the length of that response. @@ -510,10 +511,12 @@ def _getamount(self): l = self._pipei.readline() if l == '\n': - self._readerr() + if self._autoreadstderr: + self._readerr() msg = _('check previous remote output') self._abort(error.OutOfBandError(hint=msg)) - self._readerr() + if self._autoreadstderr: + self._readerr() try: return int(l) except ValueError: @@ -528,7 +531,8 @@ self._pipeo.write(data) if flush: self._pipeo.flush() - self._readerr() + if self._autoreadstderr: + self._readerr() class sshv2peer(sshv1peer): """A peer that speakers version 2 of the transport protocol."""
--- a/tests/test-ssh-proto-unbundle.t Thu Feb 15 17:18:26 2018 +0100 +++ b/tests/test-ssh-proto-unbundle.t Fri Mar 02 18:50:49 2018 -0500 @@ -45,6 +45,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -87,17 +88,15 @@ i> flush() -> None o> readline() -> 2: o> 0\n - e> read(-1) -> 115: - e> abort: incompatible Mercurial client; bundle2 required\n - e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n - remote: abort: incompatible Mercurial client; bundle2 required - remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) o> read(0) -> 0: o> readline() -> 2: o> 1\n o> read(1) -> 1: 0 result: 0 remote output: + e> read(-1) -> 115: + e> abort: incompatible Mercurial client; bundle2 required\n + e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n testing ssh2 creating ssh peer from handshake results @@ -140,17 +139,15 @@ i> flush() -> None o> readline() -> 2: o> 0\n - e> read(-1) -> 115: - e> abort: incompatible Mercurial client; bundle2 required\n - e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n - remote: abort: incompatible Mercurial client; bundle2 required - remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) o> read(0) -> 0: o> readline() -> 2: o> 1\n o> read(1) -> 1: 0 result: 0 remote output: + e> read(-1) -> 115: + e> abort: incompatible Mercurial client; bundle2 required\n + e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n $ cd .. @@ -217,6 +214,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -259,6 +257,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 196: e> adding changesets\n e> adding manifests\n @@ -268,20 +272,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 line - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -324,6 +314,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 196: e> adding changesets\n e> adding manifests\n @@ -333,20 +329,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 line - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: And a variation that writes multiple lines using ui.write @@ -360,6 +342,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -402,6 +385,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 218: e> adding changesets\n e> adding manifests\n @@ -412,21 +401,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 2 lines 1 - remote: ui.write 2 lines 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -469,6 +443,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 218: e> adding changesets\n e> adding manifests\n @@ -479,21 +459,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 2 lines 1 - remote: ui.write 2 lines 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: And a variation that does a ui.flush() after writing output @@ -507,6 +472,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -549,6 +515,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 202: e> adding changesets\n e> adding manifests\n @@ -558,20 +530,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 line flush - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -614,6 +572,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 202: e> adding changesets\n e> adding manifests\n @@ -623,20 +587,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 line flush - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: Multiple writes + flush @@ -650,6 +600,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -692,6 +643,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 206: e> adding changesets\n e> adding manifests\n @@ -702,21 +659,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1st - remote: ui.write 2nd - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -759,6 +701,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 206: e> adding changesets\n e> adding manifests\n @@ -769,21 +717,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1st - remote: ui.write 2nd - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: ui.write() + ui.write_err() output is captured @@ -797,6 +730,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -839,6 +773,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 232: e> adding changesets\n e> adding manifests\n @@ -851,23 +791,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 - remote: ui.write_err 1 - remote: ui.write 2 - remote: ui.write_err 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -910,6 +833,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 232: e> adding changesets\n e> adding manifests\n @@ -922,23 +851,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 - remote: ui.write_err 1 - remote: ui.write 2 - remote: ui.write_err 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: print() output is captured @@ -952,6 +864,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -994,6 +907,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 193: e> adding changesets\n e> adding manifests\n @@ -1003,20 +922,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: printed line - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -1059,6 +964,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 193: e> adding changesets\n e> adding manifests\n @@ -1068,20 +979,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: printed line - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: Mixed print() and ui.write() are both captured @@ -1095,6 +992,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -1137,6 +1035,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 218: e> adding changesets\n e> adding manifests\n @@ -1149,23 +1053,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 - remote: ui.write 2 - remote: print 1 - remote: print 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -1208,6 +1095,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 218: e> adding changesets\n e> adding manifests\n @@ -1220,23 +1113,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 - remote: ui.write 2 - remote: print 1 - remote: print 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: print() to stdout and stderr both get captured @@ -1250,6 +1126,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -1292,6 +1169,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 216: e> adding changesets\n e> adding manifests\n @@ -1304,23 +1187,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: stderr 1 - remote: stderr 2 - remote: stdout 1 - remote: stdout 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: testing ssh2 creating ssh peer from handshake results @@ -1363,6 +1229,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 0 + result: 0 + remote output: e> read(-1) -> 216: e> adding changesets\n e> adding manifests\n @@ -1375,23 +1247,6 @@ e> transaction abort!\n e> rollback completed\n e> abort: pretxnchangegroup.fail hook failed\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: stderr 1 - remote: stderr 2 - remote: stdout 1 - remote: stdout 2 - remote: transaction abort! - remote: rollback completed - remote: abort: pretxnchangegroup.fail hook failed - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 0 - result: 0 - remote output: $ cd .. @@ -1405,6 +1260,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -1447,21 +1303,17 @@ i> flush() -> None o> readline() -> 2: o> 0\n - e> read(-1) -> 100: - e> adding changesets\n - e> adding manifests\n - e> adding file changes\n - e> added 1 changesets with 1 changes to 1 files\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files o> read(0) -> 0: o> readline() -> 2: o> 1\n o> read(1) -> 1: 1 result: 1 remote output: + e> read(-1) -> 100: + e> adding changesets\n + e> adding manifests\n + e> adding file changes\n + e> added 1 changesets with 1 changes to 1 files\n testing ssh2 creating ssh peer from handshake results @@ -1504,21 +1356,17 @@ i> flush() -> None o> readline() -> 2: o> 0\n - e> read(-1) -> 100: - e> adding changesets\n - e> adding manifests\n - e> adding file changes\n - e> added 1 changesets with 1 changes to 1 files\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files o> read(0) -> 0: o> readline() -> 2: o> 1\n o> read(1) -> 1: 1 result: 1 remote output: + e> read(-1) -> 100: + e> adding changesets\n + e> adding manifests\n + e> adding file changes\n + e> added 1 changesets with 1 changes to 1 files\n $ cd .. @@ -1544,6 +1392,7 @@ > # This is "force" in hex. > heads 666f726365 > PUSHFILE ../initial.v1.hg + > readavailable > EOF testing ssh1 creating ssh peer from handshake results @@ -1586,6 +1435,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 1 + result: 1 + remote output: e> read(-1) -> 152: e> adding changesets\n e> adding manifests\n @@ -1595,20 +1450,6 @@ e> ui.write_err 1\n e> ui.write 2\n e> ui.write_err 2\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 - remote: ui.write_err 1 - remote: ui.write 2 - remote: ui.write_err 2 - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 1 - result: 1 - remote output: testing ssh2 creating ssh peer from handshake results @@ -1651,6 +1492,12 @@ i> flush() -> None o> readline() -> 2: o> 0\n + o> read(0) -> 0: + o> readline() -> 2: + o> 1\n + o> read(1) -> 1: 1 + result: 1 + remote output: e> read(-1) -> 152: e> adding changesets\n e> adding manifests\n @@ -1660,17 +1507,3 @@ e> ui.write_err 1\n e> ui.write 2\n e> ui.write_err 2\n - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 1 changesets with 1 changes to 1 files - remote: ui.write 1 - remote: ui.write_err 1 - remote: ui.write 2 - remote: ui.write_err 2 - o> read(0) -> 0: - o> readline() -> 2: - o> 1\n - o> read(1) -> 1: 1 - result: 1 - remote output: