Skip to content

[3.7] bpo-37531: regrtest main process uses shorter timeout (GH-16220) #16223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Sep 17, 2019
Merged

[3.7] bpo-37531: regrtest main process uses shorter timeout (GH-16220) #16223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Lib/test/libregrtest/runtest_mp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

# Display the running tests if nothing happened last N seconds
PROGRESS_UPDATE = 30.0 # seconds
assert PROGRESS_UPDATE >= PROGRESS_MIN_TIME

# Time to wait until a worker completes: should be immediate
JOIN_TIMEOUT = 30.0 # seconds
Expand Down Expand Up @@ -305,10 +306,8 @@ def __init__(self, regrtest):
self.pending = MultiprocessIterator(self.regrtest.tests)
if self.ns.timeout is not None:
self.worker_timeout = self.ns.timeout * 1.5
self.main_timeout = self.ns.timeout * 2.0
else:
self.worker_timeout = None
self.main_timeout = None
self.workers = None

def start_workers(self):
Expand Down Expand Up @@ -345,12 +344,13 @@ def _get_result(self):
except queue.Empty:
return None

use_faulthandler = (self.ns.timeout is not None)
timeout = PROGRESS_UPDATE
while True:
if self.main_timeout is not None:
faulthandler.dump_traceback_later(self.main_timeout, exit=True)
if use_faulthandler:
faulthandler.dump_traceback_later(timeout * 2.0, exit=True)

# wait for a thread
timeout = max(PROGRESS_UPDATE, PROGRESS_MIN_TIME)
try:
return self.output.get(timeout=timeout)
except queue.Empty:
Expand Down Expand Up @@ -415,7 +415,7 @@ def run_tests(self):
print()
self.regrtest.interrupted = True
finally:
if self.main_timeout is not None:
if self.ns.timeout is not None:
faulthandler.cancel_dump_traceback_later()

# a test failed (and --failfast is set) or all tests completed
Expand Down