This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7222

run-tests: use byte strings for inserted output
ClosedPublic

Authored by indygreg on Nov 4 2019, 11:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd9e7ac50b80a: run-tests: use byte strings for inserted output
Summary

We were inserting str on Python 3 which resulted in mixed
str/bytes types on the list. This would later blow up when
trying to write str to the .err file opened in bytes mode.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Nov 4 2019, 11:34 PM
indygreg added a commit: rHGd9e7ac50b80a: run-tests: use byte strings for inserted output.Nov 4 2019, 11:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd9e7ac50b80a: run-tests: use byte strings for inserted output (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 17541

tests/run-tests.py

n = 0 n = 0
for n, l in enumerate(lines): for n, l in enumerate(lines):
if not l.endswith(b'\n'): if not l.endswith(b'\n'):
l += b'\n' l += b'\n'
if l.startswith(b'#require'): if l.startswith(b'#require'):
lsplit = l.split() lsplit = l.split()
if len(lsplit) < 2 or lsplit[0] != b'#require': if len(lsplit) < 2 or lsplit[0] != b'#require':
after.setdefault(pos, []).append(' !!! invalid #require\n') after.setdefault(pos, []).append(
b' !!! invalid #require\n'
)
if not skipping: if not skipping:
haveresult, message = self._hghave(lsplit[1:]) haveresult, message = self._hghave(lsplit[1:])
if not haveresult: if not haveresult:
script = [b'echo "%s"\nexit 80\n' % message] script = [b'echo "%s"\nexit 80\n' % message]
break break
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
elif l.startswith(b'#if'): elif l.startswith(b'#if'):
lsplit = l.split() lsplit = l.split()
if len(lsplit) < 2 or lsplit[0] != b'#if': if len(lsplit) < 2 or lsplit[0] != b'#if':
after.setdefault(pos, []).append(' !!! invalid #if\n') after.setdefault(pos, []).append(b' !!! invalid #if\n')
if skipping is not None: if skipping is not None:
after.setdefault(pos, []).append(' !!! nested #if\n') after.setdefault(pos, []).append(b' !!! nested #if\n')
skipping = not self._iftest(lsplit[1:]) skipping = not self._iftest(lsplit[1:])
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
elif l.startswith(b'#else'): elif l.startswith(b'#else'):
if skipping is None: if skipping is None:
after.setdefault(pos, []).append(' !!! missing #if\n') after.setdefault(pos, []).append(b' !!! missing #if\n')
skipping = not skipping skipping = not skipping
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
elif l.startswith(b'#endif'): elif l.startswith(b'#endif'):
if skipping is None: if skipping is None:
after.setdefault(pos, []).append(' !!! missing #if\n') after.setdefault(pos, []).append(b' !!! missing #if\n')
skipping = None skipping = None
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
elif skipping: elif skipping:
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
elif l.startswith(b' >>> '): # python inlines elif l.startswith(b' >>> '): # python inlines
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
prepos = pos prepos = pos
pos = n pos = n
script.append(b'EOF\n') script.append(b'EOF\n')
inpython = False inpython = False
# Non-command/result. Queue up for merged output. # Non-command/result. Queue up for merged output.
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
if inpython: if inpython:
script.append(b'EOF\n') script.append(b'EOF\n')
if skipping is not None: if skipping is not None:
after.setdefault(pos, []).append(' !!! missing #endif\n') after.setdefault(pos, []).append(b' !!! missing #endif\n')
addsalt(n + 1, False) addsalt(n + 1, False)
# Need to end any current per-command trace # Need to end any current per-command trace
if activetrace: if activetrace:
toggletrace() toggletrace()
return salt, script, after, expected return salt, script, after, expected
def _processoutput(self, exitcode, output, salt, after, expected): def _processoutput(self, exitcode, output, salt, after, expected):
# Merge the script output back into a unified test. # Merge the script output back into a unified test.