Mercurial > hg-stable
changeset 21325:0e66eb57e42a
run-tests: generate timeout result in Test.run()
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 19 Apr 2014 20:48:16 -0700 |
| parents | 6454ddaee991 |
| children | 04e04766065f |
| files | tests/run-tests.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Sat Apr 19 20:47:14 2014 -0700 +++ b/tests/run-tests.py Sat Apr 19 20:48:16 2014 -0700 @@ -635,6 +635,8 @@ else: result.skipped = True return self.skip(missing[-1]) + elif ret == 'timeout': + return self.fail('timed out', ret) def _run(self, testtmp, replacements, env): raise NotImplemented('Subclasses must implement Test.run()') @@ -1143,8 +1145,6 @@ if result: pass - elif ret == 'timeout': - result = t.fail("timed out", ret) elif out != refout: info = {} if not options.nodiff: