Mercurial > hg
comparison tests/run-tests.py @ 33871:9e8b01d0654f
tests: fixed a bytes/unicode confusion in the test runner
Differential Revision: https://phab.mercurial-scm.org/D483
author | Alex Gaynor <alex.gaynor@gmail.com> |
---|---|
date | Wed, 23 Aug 2017 01:08:09 +0000 |
parents | aa81c7a617dd |
children | 5d2ce90c71f1 |
comparison
equal
deleted
inserted
replaced
33870:aa81c7a617dd | 33871:9e8b01d0654f |
---|---|
1457 el = expected[pos].pop(0) | 1457 el = expected[pos].pop(0) |
1458 if el: | 1458 if el: |
1459 if not el.endswith(b" (?)\n"): | 1459 if not el.endswith(b" (?)\n"): |
1460 m = optline.match(el) | 1460 m = optline.match(el) |
1461 if m: | 1461 if m: |
1462 conditions = [c for c in m.group(2).split(' ')] | 1462 conditions = [c for c in m.group(2).split(b' ')] |
1463 | 1463 |
1464 if self._hghave(conditions)[0]: | 1464 if self._hghave(conditions)[0]: |
1465 # Don't append as optional line | 1465 # Don't append as optional line |
1466 continue | 1466 continue |
1467 else: | 1467 else: |