fixup

Author: xoviat

pytest_timeout.py

@@ -28,7 +28,7 @@
 if HAVE_SIGALRM:
     DEFAULT_METHOD = "signal"
 else:
-    DEFAULT_METHOD = "exception"
+    DEFAULT_METHOD = "thread"
 TIMEOUT_DESC = """
 Timeout in seconds before dumping the stacks.  Default is 0 which
 means no timeout.
@@ -61,14 +61,14 @@ def pytest_addoption(parser):
     group.addoption(
         "--timeout_method",
         action="store",
-        choices=["signal", "thread", "exception"],
+        choices=["signal", "thread"],
         help="Deprecated, use --timeout-method",
     )
     group.addoption(
         "--timeout-method",
         dest="timeout_method",
         action="store",
-        choices=["signal", "thread", "exception"],
+        choices=["signal", "thread"],
         help=METHOD_DESC,
     )
     parser.addini("timeout", TIMEOUT_DESC)
@@ -199,11 +199,11 @@ def timeout_setup(item):
     if params.timeout is None or params.timeout <= 0:
         return
 
-    if params.method == "signal" and not (current_thread() is main_thread()):
-        params.method = "thread"
-
-    if params.method == "signal":
+    timeout_method = params.method
+    if timeout_method == "signal" and not (current_thread() is main_thread()):
+        timeout_method = "thread"
 
+    if timeout_method == "signal":
         def handler(signum, frame):
             __tracebackhide__ = True
             timeout_sigalrm(item, params.timeout)
@@ -215,18 +215,8 @@ def cancel():
         item.cancel_timeout = cancel
         signal.signal(signal.SIGALRM, handler)
         signal.setitimer(signal.ITIMER_REAL, params.timeout)
-    elif params.method == "thread":
-        timer = threading.Timer(params.timeout, timeout_timer, (item, params.timeout))
-        timer.name = "%s %s" % (__name__, item.nodeid)
-
-        def cancel():
-            timer.cancel()
-            timer.join()
-
-        item.cancel_timeout = cancel
-        timer.start()
-    elif params.method == "exception":
-        timer = threading.Timer(params.timeout, timeout_exception, (current_thread(), item, params.timeout))
+    elif timeout_method == "thread":
+        timer = threading.Timer(params.timeout, timeout_timer, (item, params.timeout, current_thread()))
         timer.name = "%s %s" % (__name__, item.nodeid)
 
         def cancel():
@@ -394,49 +384,7 @@ def timeout_sigalrm(item, timeout):
     pytest.fail("Timeout >%ss" % timeout)
 
 
-def timeout_timer(item, timeout):
-    """Dump stack of threads and call os._exit().
-
-    This disables the capturemanager and dumps stdout and stderr.
-    Then the stacks are dumped and os._exit(1) is called.
-    """
-    if is_debugging():
-        return
-    try:
-        capman = item.config.pluginmanager.getplugin("capturemanager")
-        if capman:
-            pytest_version = LooseVersion(pytest.__version__)
-            if pytest_version >= LooseVersion("3.7.3"):
-                capman.suspend_global_capture(item)
-                stdout, stderr = capman.read_global_capture()
-            else:
-                stdout, stderr = capman.suspend_global_capture(item)
-        else:
-            stdout, stderr = None, None
-        write_title("Timeout", sep="+")
-        caplog = item.config.pluginmanager.getplugin("_capturelog")
-        if caplog and hasattr(item, "capturelog_handler"):
-            log = item.capturelog_handler.stream.getvalue()
-            if log:
-                write_title("Captured log")
-                write(log)
-        if stdout:
-            write_title("Captured stdout")
-            write(stdout)
-        if stderr:
-            write_title("Captured stderr")
-            write(stderr)
-        dump_stacks()
-        write_title("Timeout", sep="+")
-    except Exception:
-        traceback.print_exc()
-    finally:
-        sys.stdout.flush()
-        sys.stderr.flush()
-        os._exit(1)
-
-
-def timeout_exception(thread, item, timeout):
+def timeout_timer(item, timeout, thread):
     """Dump stack of threads and call os._exit().
 
     This disables the capturemanager and dumps stdout and stderr.