This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9377

tests: make test-worker.t pass on py2
ClosedPublic

Authored by martinvonz on Nov 23 2020, 3:18 PM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG64faa55716f4: tests: make test-worker.t pass on py2
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 23 2020, 3:18 PM
marmoute added a subscriber: marmoute.Nov 23 2020, 3:50 PM

Thanks for tackling this.

marmoute accepted this revision.Nov 24 2020, 12:40 PM
mharbison72 accepted this revision.Nov 24 2020, 4:33 PM
This revision is now accepted and ready to land.Nov 24 2020, 4:33 PM
martinvonz added a commit: rHG64faa55716f4: tests: make test-worker.t pass on py2.Nov 24 2020, 4:38 PM
Closed by commit rHG64faa55716f4: tests: make test-worker.t pass on py2 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (4 lines)
Mtests/test-worker.t (3 lines)

Diff 23654

mercurial/error.py

__bytes__ = _tobytes __bytes__ = _tobytes
class WorkerError(Exception): class WorkerError(Exception):
"""Exception raised when a worker process dies.""" """Exception raised when a worker process dies."""
def __init__(self, status_code): def __init__(self, status_code):
self.status_code = status_code self.status_code = status_code
# Pass status code to superclass just so it becomes part of __bytes__
super(WorkerError, self).__init__(status_code)
__bytes__ = _tobytes
class InterventionRequired(Hint, Exception): class InterventionRequired(Hint, Exception):
"""Exception raised when a command requires human intervention.""" """Exception raised when a command requires human intervention."""
__bytes__ = _tobytes __bytes__ = _tobytes

tests/test-worker.t

[255] [255]
$ hg --config "extensions.t=$abspath" --config 'worker.numcpus=8' \ $ hg --config "extensions.t=$abspath" --config 'worker.numcpus=8' \
> test 100000.0 abort --traceback 2>&1 | egrep '(WorkerError|Abort)' > test 100000.0 abort --traceback 2>&1 | egrep '(WorkerError|Abort)'
raise error.Abort(b'known exception') raise error.Abort(b'known exception')
mercurial.error.Abort: known exception (py3 !) mercurial.error.Abort: known exception (py3 !)
Abort: known exception (no-py3 !) Abort: known exception (no-py3 !)
raise error.WorkerError(status) raise error.WorkerError(status)
mercurial.error.WorkerError: 255 WorkerError: 255 (no-py3 !)
mercurial.error.WorkerError: 255 (py3 !)
Traceback must be printed for unknown exceptions Traceback must be printed for unknown exceptions
$ hg --config "extensions.t=$abspath" --config 'worker.numcpus=8' \ $ hg --config "extensions.t=$abspath" --config 'worker.numcpus=8' \
> test 100000.0 exc 2>&1 | grep '^Exception' > test 100000.0 exc 2>&1 | grep '^Exception'
Exception: unknown exception Exception: unknown exception
Workers should not do cleanups in all cases Workers should not do cleanups in all cases