This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4444

tests: avoid shellquoting bytes on Python 3
ClosedPublic

Authored by durin42 on Sep 1 2018, 11:10 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf57682dca1c1: tests: avoid shellquoting bytes on Python 3
Summary

Should fix Python 3 builder.

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

durin42 created this revision.Sep 1 2018, 11:10 AM
Closed by commit rHGf57682dca1c1: tests: avoid shellquoting bytes on Python 3 (authored by durin42). · Explain WhySep 2 2018, 1:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (6 lines)

Diff 10711

tests/run-tests.py

script.append(b'%s %d 0\n' % (salt, line)) script.append(b'%s %d 0\n' % (salt, line))
else: else:
script.append(b'echo %s %d $?\n' % (salt, line)) script.append(b'echo %s %d $?\n' % (salt, line))
active = [] active = []
session = str(uuid.uuid4()) session = str(uuid.uuid4())
if PYTHON3: if PYTHON3:
session = session.encode('ascii') session = session.encode('ascii')
def toggletrace(cmd): def toggletrace(cmd):
quoted = shellquote(cmd.strip()).replace(b'\\', b'\\\\') if isinstance(cmd, str):
quoted = shellquote(cmd.strip())
else:
quoted = shellquote(cmd.strip().decode('utf8')).encode('utf8')
quoted = quoted.replace(b'\\', b'\\\\')
if active: if active:
script.append( script.append(
b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
session, active[0])) session, active[0]))
script.append( script.append(
b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
session, quoted)) session, quoted))
active[0:] = [quoted] active[0:] = [quoted]