D6577: py3: make catapult usable from the test runner in py3
rdamazio (Rodrigo Damazio Bovendorp)
phabricator at mercurial-scm.org
Wed Jun 26 02:38:35 UTC 2019
rdamazio created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6577
AFFECTED FILES
tests/run-tests.py
CHANGE DETAILS
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1474,6 +1474,12 @@
script.append(b'alias pwd="pwd -W"\n')
if hgcatapult and hgcatapult != os.devnull:
+ if PYTHON3:
+ hgcatapult = hgcatapult.encode('utf8')
+ cataname = self.name.encode('utf8')
+ else:
+ cataname = self.name
+
# Kludge: use a while loop to keep the pipe from getting
# closed by our echo commands. The still-running file gets
# reaped at the end of the script, which causes the while
@@ -1490,9 +1496,9 @@
b'HGCATAPULTSESSION=%(session)s ; export HGCATAPULTSESSION\n'
b'echo START %(session)s %(name)s >> %(catapult)s\n'
% {
- 'name': self.name,
- 'session': session,
- 'catapult': hgcatapult,
+ b'name': cataname,
+ b'session': session,
+ b'catapult': hgcatapult,
}
)
To: rdamazio, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list