mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
tests: better output on timeouts
Formerly, timeouts would generate huge scrollback-destroying diffs and weird -15 return codes in the summary. Now we simply report "timed out".
This commit is contained in:
parent
1ee89471ca
commit
a9372128fb
@ -620,7 +620,8 @@ def run(cmd, options, replacements):
|
||||
ret = os.WEXITSTATUS(ret)
|
||||
except Timeout:
|
||||
vlog('# Process %d timed out - killing it' % proc.pid)
|
||||
ret = cleanup()
|
||||
cleanup()
|
||||
ret = 'timeout'
|
||||
output += ("\n### Abort: timeout after %d seconds.\n"
|
||||
% options.timeout)
|
||||
except KeyboardInterrupt:
|
||||
@ -752,11 +753,13 @@ def runone(options, test, skips, fails):
|
||||
skip(missing[-1])
|
||||
elif out != refout:
|
||||
mark = '!'
|
||||
if ret:
|
||||
if ret == 'timeout':
|
||||
fail("timed out")
|
||||
elif ret:
|
||||
fail("output changed and returned error code %d" % ret)
|
||||
else:
|
||||
fail("output changed")
|
||||
if not options.nodiff:
|
||||
if ret != 'timeout' and not options.nodiff:
|
||||
if options.view:
|
||||
os.system("%s %s %s" % (options.view, ref, err))
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user