Mercurial > hg-stable
changeset 21327:206814c9072a
run-tests: move remaining result processing to Test.run()
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 19 Apr 2014 20:53:45 -0700 |
| parents | 04e04766065f |
| children | 9da0761a22a1 |
| files | tests/run-tests.py |
| diffstat | 1 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Sat Apr 19 20:52:58 2014 -0700 +++ b/tests/run-tests.py Sat Apr 19 20:53:45 2014 -0700 @@ -662,6 +662,10 @@ msg += 'output changed' return self.fail(msg, ret) + elif ret: + return self.fail(describe(ret), ret) + else: + return self.success() def _run(self, testtmp, replacements, env): raise NotImplemented('Subclasses must implement Test.run()') @@ -1163,13 +1167,6 @@ f.write(line) f.close() - if result: - pass - elif ret: - result = t.fail(describe(ret), ret) - else: - result = t.success() - if not options.verbose: iolock.acquire() sys.stdout.write(result[0])