Mercurial > hg
changeset 28568:4a908089fe29
run-tests: indent _processoutput to aid readability for next patch
The next commit will loop over the expected[pos] list, this change
makes that change easier to review.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 17 Mar 2016 20:54:36 +0000 |
| parents | ca52512ac709 |
| children | 1ad0ddf8cccc |
| files | tests/run-tests.py |
| diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Wed Mar 16 23:12:43 2016 +0000 +++ b/tests/run-tests.py Thu Mar 17 20:54:36 2016 +0000 @@ -1111,21 +1111,21 @@ el = None if expected.get(pos, None): el = expected[pos].pop(0) - - r = TTest.linematch(el, lout) - if isinstance(r, str): - if r == '+glob': - lout = el[:-1] + ' (glob)\n' - r = '' # Warn only this line. - elif r == '-glob': - lout = ''.join(el.rsplit(' (glob)', 1)) - r = '' # Warn only this line. - elif r == "retry": - postout.append(b' ' + el) - continue - else: - log('\ninfo, unknown linematch result: %r\n' % r) - r = False + if True: + r = TTest.linematch(el, lout) + if isinstance(r, str): + if r == '+glob': + lout = el[:-1] + ' (glob)\n' + r = '' # Warn only this line. + elif r == '-glob': + lout = ''.join(el.rsplit(' (glob)', 1)) + r = '' # Warn only this line. + elif r == "retry": + postout.append(b' ' + el) + continue + else: + log('\ninfo, unknown linematch result: %r\n' % r) + r = False if r: postout.append(b' ' + el) else: