This is an archive of the discontinued Mercurial Phabricator instance.

Differential D270

tests: fix up test-run-tests failures on Python 3.6
ClosedPublic

Authored by durin42 on Aug 8 2017, 3:48 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG2e43c5cd57a7: tests: fix up test-run-tests failures on Python 3.6
Summary

Some of the recent work on run-tests.py didn't work on Python 3. This
fixes the regressions.

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.Aug 8 2017, 3:48 PM
quark accepted this revision.Aug 9 2017, 1:12 AM
Closed by commit rHG2e43c5cd57a7: tests: fix up test-run-tests failures on Python 3.6 (authored by durin42). · Explain WhyAug 9 2017, 10:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (9 lines)
Mtests/test-run-tests.py (2 lines)

Diff 666

tests/run-tests.py

terminal256formatter = formatters.Terminal256Formatter() terminal256formatter = formatters.Terminal256Formatter()
except ImportError: except ImportError:
pass pass
if sys.version_info > (3, 5, 0): if sys.version_info > (3, 5, 0):
PYTHON3 = True PYTHON3 = True
xrange = range # we use xrange in one place, and we'd rather not use range xrange = range # we use xrange in one place, and we'd rather not use range
def _bytespath(p): def _bytespath(p):
if p is None:
return p
return p.encode('utf-8') return p.encode('utf-8')
def _strpath(p): def _strpath(p):
if p is None:
return p
return p.decode('utf-8') return p.decode('utf-8')
elif sys.version_info >= (3, 0, 0): elif sys.version_info >= (3, 0, 0):
print('%s is only supported on Python 3.5+ and 2.7, not %s' % print('%s is only supported on Python 3.5+ and 2.7, not %s' %
(sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3]))) (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
sys.exit(70) # EX_SOFTWARE from `man 3 sysexit` sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
else: else:
PYTHON3 = False PYTHON3 = False
els.pop(i) els.pop(i)
break break
if el: if el:
if el.endswith(b" (?)\n"): if el.endswith(b" (?)\n"):
optional.append(i) optional.append(i)
else: else:
m = optline.match(el) m = optline.match(el)
if m: if m:
conditions = [c for c in m.group(2).split(' ')] conditions = [
c for c in m.group(2).split(b' ')]
if not self._hghave(conditions)[0]: if not self._hghave(conditions)[0]:
optional.append(i) optional.append(i)
i += 1 i += 1
if r: if r:
if r == "retry": if r == "retry":
return True return True
if el: if el:
if el.endswith(b" (?)\n"): if el.endswith(b" (?)\n"):
retry = "retry" retry = "retry"
el = el[:-5] + b"\n" el = el[:-5] + b"\n"
else: else:
m = optline.match(el) m = optline.match(el)
if m: if m:
conditions = [c for c in m.group(2).split(' ')] conditions = [c for c in m.group(2).split(b' ')]
el = m.group(1) + b"\n" el = m.group(1) + b"\n"
if not self._hghave(conditions)[0]: if not self._hghave(conditions)[0]:
retry = "retry" # Not required by listed features retry = "retry" # Not required by listed features
if el.endswith(b" (esc)\n"): if el.endswith(b" (esc)\n"):
if PYTHON3: if PYTHON3:
el = el[:-7].decode('unicode_escape') + '\n' el = el[:-7].decode('unicode_escape') + '\n'

tests/test-run-tests.py

>>> try: lm(b'single backslash\n', b'single \backslash\n') >>> try: lm(b'single backslash\n', b'single \backslash\n')
... except AssertionError as ex: prn(ex) ... except AssertionError as ex: prn(ex)
single backslash or unknown char single backslash or unknown char
""" """
assert (expected.endswith(b'\n') assert (expected.endswith(b'\n')
and output.endswith(b'\n')), 'missing newline' and output.endswith(b'\n')), 'missing newline'
assert not re.search(br'[^ \w\\/\r\n()*?]', expected + output), \ assert not re.search(br'[^ \w\\/\r\n()*?]', expected + output), \
b'single backslash or unknown char' b'single backslash or unknown char'
test = run_tests.TTest('test-run-test.t', '.', '.') test = run_tests.TTest(b'test-run-test.t', b'.', b'.')
match = test.linematch(expected, output) match = test.linematch(expected, output)
if isinstance(match, str): if isinstance(match, str):
return 'special: ' + match return 'special: ' + match
elif isinstance(match, bytes): elif isinstance(match, bytes):
return 'special: ' + match.decode('utf-8') return 'special: ' + match.decode('utf-8')
else: else:
return bool(match) # do not return match object return bool(match) # do not return match object