summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-04-01 16:16:36 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-04-01 16:16:36 (GMT)
commitd91a5caf0d8c8fa754d07d733f21c0e442b9067f (patch)
tree59506e6ab31b7441b6f4acac5e5ab931e7ee737f
parent305bff1ef5715c1a6db1e42a8b62bf8240109bb0 (diff)
downloadcpython-d91a5caf0d8c8fa754d07d733f21c0e442b9067f.zip
cpython-d91a5caf0d8c8fa754d07d733f21c0e442b9067f.tar.gz
cpython-d91a5caf0d8c8fa754d07d733f21c0e442b9067f.tar.bz2
Issue #11727: set regrtest default timeout to 30 minutes
-rwxr-xr-xLib/test/regrtest.py4
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 59f57d5..704ad77 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -22,7 +22,7 @@ Options:
-h/--help -- print this text and exit
--timeout TIMEOUT
-- dump the traceback and exit if a test takes more
- than TIMEOUT seconds (default: 15 minutes); disable
+ than TIMEOUT seconds (default: 30 minutes); disable
the timeout if TIMEOUT is zero
Verbosity
@@ -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=15*60):
+ header=False, timeout=30*60):
"""Execute a test suite.
This also parses command-line options and modifies its behavior
diff --git a/Misc/NEWS b/Misc/NEWS
index 5a0e8a3..31d896a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -361,7 +361,7 @@ Extensions
Tests
-----
-- Issue #11727: If a test takes more than 15 minutes, regrtest dumps the
+- 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.