regrtest: log timeout at startup (GH-19514)
Reduce also worker timeout.
This commit is contained in:
parent
62f75fe3dd
commit
4cf65a630a
|
@ -394,7 +394,10 @@ class Regrtest:
|
|||
|
||||
save_modules = sys.modules.keys()
|
||||
|
||||
self.log("Run tests sequentially")
|
||||
msg = "Run tests sequentially"
|
||||
if self.ns.timeout:
|
||||
msg += " (timeout: %s)" % format_duration(self.ns.timeout)
|
||||
self.log(msg)
|
||||
|
||||
previous_test = None
|
||||
for test_index, test_name in enumerate(self.tests, 1):
|
||||
|
|
|
@ -352,7 +352,11 @@ class MultiprocessTestRunner:
|
|||
self.output = queue.Queue()
|
||||
self.pending = MultiprocessIterator(self.regrtest.tests)
|
||||
if self.ns.timeout is not None:
|
||||
self.worker_timeout = self.ns.timeout * 1.5
|
||||
# Rely on faulthandler to kill a worker process. This timouet is
|
||||
# when faulthandler fails to kill a worker process. Give a maximum
|
||||
# of 5 minutes to faulthandler to kill the worker.
|
||||
self.worker_timeout = min(self.ns.timeout * 1.5,
|
||||
self.ns.timeout + 5 * 60)
|
||||
else:
|
||||
self.worker_timeout = None
|
||||
self.workers = None
|
||||
|
@ -360,8 +364,12 @@ class MultiprocessTestRunner:
|
|||
def start_workers(self):
|
||||
self.workers = [TestWorkerProcess(index, self)
|
||||
for index in range(1, self.ns.use_mp + 1)]
|
||||
self.log("Run tests in parallel using %s child processes"
|
||||
% len(self.workers))
|
||||
msg = f"Run tests in parallel using {len(self.workers)} child processes"
|
||||
if self.ns.timeout:
|
||||
msg += (" (timeout: %s, worker timeout: %s)"
|
||||
% (format_duration(self.ns.timeout),
|
||||
format_duration(self.worker_timeout)))
|
||||
self.log(msg)
|
||||
for worker in self.workers:
|
||||
worker.start()
|
||||
|
||||
|
|
Loading…
Reference in New Issue