( )⚙ D483 tests: fixed a bytes/unicode confusion in the test runner

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D483

tests: fixed a bytes/unicode confusion in the test runner
ClosedPublic

Authored by alex.gaynor on Aug 22 2017, 9:12 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9e8b01d0654f: tests: fixed a bytes/unicode confusion in the test runner

Diff Detail

Repository
rHG Mercurial
Branch
py3k-test (bookmark) on default (branch)
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

alex.gaynor created this revision.Aug 22 2017, 9:12 PM
indygreg accepted this revision.Aug 22 2017, 9:40 PM
This revision is now accepted and ready to land.Aug 22 2017, 9:40 PM
Closed by commit rHG9e8b01d0654f: tests: fixed a bytes/unicode confusion in the test runner (authored by alex.gaynor). · Explain WhyAug 23 2017, 9:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 1165

tests/run-tests.py

else: else:
# clean up any optional leftovers # clean up any optional leftovers
while expected.get(pos, None): while expected.get(pos, None):
el = expected[pos].pop(0) el = expected[pos].pop(0)
if el: if el:
if not el.endswith(b" (?)\n"): if not el.endswith(b" (?)\n"):
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 self._hghave(conditions)[0]: if self._hghave(conditions)[0]:
# Don't append as optional line # Don't append as optional line
continue continue
else: else:
continue continue
postout.append(b' ' + el) postout.append(b' ' + el)