diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index d80472d8776f6c..775d7e6a12917c 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -2056,7 +2056,7 @@ def wait_process(pid, *, exitcode, timeout=None): # process is still running dt = time.monotonic() - t0 - if dt > SHORT_TIMEOUT: + if dt > timeout: try: os.kill(pid, signal.SIGKILL) os.waitpid(pid, 0) @@ -2065,7 +2065,8 @@ def wait_process(pid, *, exitcode, timeout=None): pass raise AssertionError(f"process {pid} is still running " - f"after {dt:.1f} seconds") + f"after {dt:.1f} seconds, " + f"timeout is {timeout} seconds") sleep = min(sleep * 2, max_sleep) time.sleep(sleep) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 4f3315161cf20f..adf12d7f6c2ddf 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -747,7 +747,7 @@ def lock_holder_thread_fn(): fork_happened__release_locks_and_end_thread.set() lock_holder_thread.join() - support.wait_process(pid, exitcode=0) + support.wait_process(pid, exitcode=0, timeout=support.LONG_TIMEOUT) class BadStream(object):