comparison tests/test-worker.t @ 45903:64faa55716f4

tests: make test-worker.t pass on py2 I broke the py2 version in https://phab.mercurial-scm.org/D9287 because the `WorkerError.__bytes__()` (or `.__str__()`?) output was different in py2 compared to py3. Part of the problem was that I didn't propagate the status code that was passed in to the superclass so it could get printed. This patch fixes that. I don't know how it worked on py3 before this patch... I also added the usual `__bytes__ = _tobytes` override for good measure. It doesn't seem to be needed for tests to pass, though. Differential Revision: https://phab.mercurial-scm.org/D9377
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 11:56:10 -0800
parents 8f07f5a9c3de
children af0b21d5a930
comparison
equal deleted inserted replaced
45902:6da22a068281 45903:64faa55716f4
88 > test 100000.0 abort --traceback 2>&1 | egrep '(WorkerError|Abort)' 88 > test 100000.0 abort --traceback 2>&1 | egrep '(WorkerError|Abort)'
89 raise error.Abort(b'known exception') 89 raise error.Abort(b'known exception')
90 mercurial.error.Abort: known exception (py3 !) 90 mercurial.error.Abort: known exception (py3 !)
91 Abort: known exception (no-py3 !) 91 Abort: known exception (no-py3 !)
92 raise error.WorkerError(status) 92 raise error.WorkerError(status)
93 mercurial.error.WorkerError: 255 93 WorkerError: 255 (no-py3 !)
94 mercurial.error.WorkerError: 255 (py3 !)
94 95
95 Traceback must be printed for unknown exceptions 96 Traceback must be printed for unknown exceptions
96 97
97 $ hg --config "extensions.t=$abspath" --config 'worker.numcpus=8' \ 98 $ hg --config "extensions.t=$abspath" --config 'worker.numcpus=8' \
98 > test 100000.0 exc 2>&1 | grep '^Exception' 99 > test 100000.0 exc 2>&1 | grep '^Exception'