summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-04-04 10:54:33 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-04-04 10:54:33 (GMT)
commitf7ec1698a244a7b560f27f6da877937d3c34c18c (patch)
treefea6dbb120b71661de566a39048204117f874d94
parentda9edae1f4adb9d1289a557b5fb99075bfe690d5 (diff)
downloadcpython-f7ec1698a244a7b560f27f6da877937d3c34c18c.zip
cpython-f7ec1698a244a7b560f27f6da877937d3c34c18c.tar.gz
cpython-f7ec1698a244a7b560f27f6da877937d3c34c18c.tar.bz2
Reenable regrtest.py timeout (30 min): #11738 and #11753 looks to be fixed
-rwxr-xr-xLib/test/regrtest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index bc67f78..704ad77 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=None):
+ header=False, timeout=30*60):
"""Execute a test suite.
This also parses command-line options and modifies its behavior