switch to seconds

Author: okken

pytest_timeout.py

@@ -19,6 +19,7 @@
 
 
 __all__ = ("is_debugging", "Settings")
+suite_timeout_key = pytest.StashKey[float]()
 
 
 HAVE_SIGALRM = hasattr(signal, "SIGALRM")
@@ -45,9 +46,9 @@
 will be interrupted by the timeout.
 """.strip()
 SUITE_TIMEOUT_DESC = """
-Timeout in minutes for entire suite.  Default is None which
+Timeout in seconds for entire suite.  Default is None which
 means no timeout. Timeout is checked between tests, and will not interrupt a test 
-in progress. Can be specified as a float for partial minutes.
+in progress. 
 """.strip()
 
 # bdb covers pdb, ipdb, and possibly others
@@ -91,7 +92,7 @@ def pytest_addoption(parser):
         dest="suite_timeout",
         default=None,
         type=float,
-        metavar="minutes",
+        metavar="SECONDS",
         help=SUITE_TIMEOUT_DESC,
     )
     parser.addini("timeout", TIMEOUT_DESC)
@@ -162,10 +163,12 @@ def pytest_configure(config):
     config._env_timeout_func_only = settings.func_only
     config._env_timeout_disable_debugger_detection = settings.disable_debugger_detection
 
-    _suite_timeout_minutes = config.getoption("--suite-timeout")
-    if _suite_timeout_minutes:
-        _suite_expire_time = time.time() + (_suite_timeout_minutes * 60)
-
+    timeout = config.getoption("--suite-timeout")
+    if timeout is not None:
+        expire_time = time.time() + timeout
+    else:
+        expire_time = 0
+    config.stash[suite_timeout_key] = expire_time
 
 
 @pytest.hookimpl(hookwrapper=True)
@@ -533,7 +536,10 @@ def dump_stacks(terminal):
         terminal.write("".join(traceback.format_stack(frame)))
 
 
-def pytest_runtest_logfinish(nodeid, location):
-    if _suite_expire_time and _suite_expire_time < time.time():
-        pytest.exit(f"suite-timeout: {_suite_timeout_minutes} minutes exceeded",
-                    returncode=0)
+def pytest_runtest_makereport(item, call):
+    session = item.session
+    config = session.config
+    expire_time = config.stash[suite_timeout_key]
+    if expire_time and (expire_time < time.time()):
+        timeout = config.getoption("--suite-timeout")
+        session.shouldfail = f"suite-timeout: {timeout} sec exceeded"

test_pytest_timeout.py

@@ -611,14 +611,9 @@ def test_suite_timeout(pytester):
 
      @pytest.mark.parametrize('i', range(10))
      def test_foo(i):
-         time.sleep(0.1)
+         time.sleep(1)
     """
     )
-    # each parametrization runs for 0.1 sec
-    # or about 0.00166 seconds each
-    # so 0.005 min should be about 3 iterations
-    result = pytester.runpytest_subprocess("--suite-timeout", "0.005")
-    result.stdout.fnmatch_lines([
-        "*= 3 passed * =*",
-        "*!! * suite-timeout: 0.005 minutes exceeded !!!*"
-        ])
+    result = pytester.runpytest_subprocess("--suite-timeout", "0.5")
+    result.stdout.fnmatch_lines(["*!! suite-timeout: 0.5 sec exceeded !!!*"])
+    result.assert_outcomes(passed=1)