summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-04-03 21:46:42 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-04-03 21:46:42 (GMT)
commitd7edf3b82de5d8491f830aa576d7103fd818c3fd (patch)
tree9c3833e8c388ca6eb9411e984d56fe05c5c51cdc
parentf77ccc6d7e2f731e0a288282fd8dba48b05be12f (diff)
downloadcpython-d7edf3b82de5d8491f830aa576d7103fd818c3fd.zip
cpython-d7edf3b82de5d8491f830aa576d7103fd818c3fd.tar.gz
cpython-d7edf3b82de5d8491f830aa576d7103fd818c3fd.tar.bz2
Issue #11727, issue #11753, issue #11755: disable regrtest timeout
Disable regrtest timeout until #11753 and #11755 are fixed
-rwxr-xr-xLib/test/regrtest.py2
-rw-r--r--Misc/NEWS5
2 files changed, 3 insertions, 4 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 704ad77..bc67f78 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -240,7 +240,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
findleaks=False, use_resources=None, trace=False, coverdir='coverage',
runleaks=False, huntrleaks=False, verbose2=False, print_slow=False,
random_seed=None, use_mp=None, verbose3=False, forever=False,
- header=False, timeout=30*60):
+ header=False, timeout=None):
"""Execute a test suite.
This also parses command-line options and modifies its behavior
diff --git a/Misc/NEWS b/Misc/NEWS
index 9fa8853..9afa06c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -370,9 +370,8 @@ Extensions
Tests
-----
-- Issue #11727: If a test takes more than 30 minutes, regrtest dumps the
- traceback of all threads and exits. Use --timeout option to change the
- default timeout or to disable it.
+- Issue #11727: Add a --timeout option to regrtest: if a test takes more than
+ TIMEOUT seconds, dumps the traceback of all threads and exits.
- Issue #11653: fix -W with -j in regrtest.