summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-03-31 16:27:50 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-03-31 16:27:50 (GMT)
commit7d648a0cecfc90bb1b24e4effd5ee9020167c064 (patch)
tree8572b9d6aeadc5c96c752f4c8de755cac294347e /Lib
parenta256bacf918d0c242ad29ce6d3f9b4a507b47609 (diff)
downloadcpython-7d648a0cecfc90bb1b24e4effd5ee9020167c064.zip
cpython-7d648a0cecfc90bb1b24e4effd5ee9020167c064.tar.gz
cpython-7d648a0cecfc90bb1b24e4effd5ee9020167c064.tar.bz2
Issue #11727: Antoine and Arfrever don't like "0 < timeout" style (regrtest.py)
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/test/regrtest.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index f14b89d..8e9fe65 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -818,7 +818,8 @@ def runtest(test, verbose, quiet,
support.verbose = verbose # Tell tests to be moderately quiet
if use_resources is not None:
support.use_resources = use_resources
- if timeout is not None and timeout > 0:
+ use_timeout = (timeout is not None and timeout > 0)
+ if use_timeout:
faulthandler.dump_tracebacks_later(timeout, exit=True)
try:
result = runtest_inner(test, verbose, quiet, huntrleaks, debug)
@@ -830,7 +831,7 @@ def runtest(test, verbose, quiet,
runtest(test, True, quiet, huntrleaks, debug, timeout=timeout)
return result
finally:
- if timeout and 0 < timeout:
+ if use_timeout:
faulthandler.cancel_dump_tracebacks_later()
cleanup_test_droppings(test, verbose)