From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 6 Jun 2011 10:14:23 +0000 (+0200)
Subject: Issue #12250: regrtest --timeout displays a warning instead of failing with an
X-Git-Tag: v3.3.0a1~2174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=883456833c897ae24a7fb0ac0ff61adfde3531c2;p=python

Issue #12250: regrtest --timeout displays a warning instead of failing with an
error if faulthandler.dump_tracebacks_later() is missing (e.g. if Python is
compiled without threads).
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 529734abb4..968b59df5a 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -415,12 +415,13 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
             # join it with the saved CWD so it ends up where the user expects.
             testdir = os.path.join(support.SAVEDCWD, a)
         elif o == '--timeout':
-            if not hasattr(faulthandler, 'dump_tracebacks_later'):
-                print("The timeout option requires "
-                      "faulthandler.dump_tracebacks_later", file=sys.stderr)
-                sys.exit(1)
-            timeout = float(a)
-            if timeout <= 0:
+            if hasattr(faulthandler, 'dump_tracebacks_later'):
+                timeout = float(a)
+                if timeout <= 0:
+                    timeout = None
+            else:
+                print("Warning: The timeout option requires "
+                      "faulthandler.dump_tracebacks_later")
                 timeout = None
         elif o == '--wait':
             input("Press any key to continue...")