[Python-checkins] Call busy_retry() and sleeping_retry() with error=True (#93871)
vstinner
webhook-mailer at python.org
Thu Jun 16 07:45:05 EDT 2022
https://github.com/python/cpython/commit/484b40bf189ae881992366f2b7b6b63812d18591
commit: 484b40bf189ae881992366f2b7b6b63812d18591
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-06-16T13:44:58+02:00
summary:
Call busy_retry() and sleeping_retry() with error=True (#93871)
Tests no longer call busy_retry() and sleeping_retry() with
error=False: raise an exception if the loop times out.
files:
M Lib/test/fork_wait.py
M Lib/test/test_asyncore.py
M Lib/test/test_logging.py
M Lib/test/test_signal.py
M Lib/test/test_wait3.py
M Lib/test/test_wait4.py
diff --git a/Lib/test/fork_wait.py b/Lib/test/fork_wait.py
index c565f59355948..ebd07e612e581 100644
--- a/Lib/test/fork_wait.py
+++ b/Lib/test/fork_wait.py
@@ -54,7 +54,7 @@ def test_wait(self):
self.threads.append(thread)
# busy-loop to wait for threads
- for _ in support.sleeping_retry(support.SHORT_TIMEOUT, error=False):
+ for _ in support.sleeping_retry(support.SHORT_TIMEOUT):
if len(self.alive) >= NUM_THREADS:
break
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 7d3e2011189a5..5a037fb9c5d59 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -76,7 +76,7 @@ def capture_server(evt, buf, serv):
pass
else:
n = 200
- for _ in support.busy_retry(support.SHORT_TIMEOUT, error=False):
+ for _ in support.busy_retry(support.SHORT_TIMEOUT):
r, w, e = select.select([conn], [], [], 0.1)
if r:
n -= 1
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d43742ef603f9..5200281769f76 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3613,11 +3613,10 @@ def do_queuehandler_configuration(self, qspec, lspec):
logging.warning('baz')
# Need to let the listener thread finish its work
- while support.sleeping_retry(support.LONG_TIMEOUT, error=False):
+ while support.sleeping_retry(support.LONG_TIMEOUT,
+ "queue not empty"):
if qh.listener.queue.empty():
break
- else:
- self.fail("queue not empty")
with open(fn, encoding='utf-8') as f:
data = f.read().splitlines()
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 2e115f45be472..2562a57ea421f 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -812,16 +812,12 @@ def test_itimer_virtual(self):
signal.signal(signal.SIGVTALRM, self.sig_vtalrm)
signal.setitimer(self.itimer, 0.3, 0.2)
- for _ in support.busy_retry(support.LONG_TIMEOUT, error=False):
+ for _ in support.busy_retry(support.LONG_TIMEOUT):
# use up some virtual time by doing real work
_ = pow(12345, 67890, 10000019)
if signal.getitimer(self.itimer) == (0.0, 0.0):
# sig_vtalrm handler stopped this itimer
break
- else:
- # bpo-8424
- self.skipTest("timeout: likely cause: machine too slow or load too "
- "high")
# virtual itimer should be (0.0, 0.0) now
self.assertEqual(signal.getitimer(self.itimer), (0.0, 0.0))
@@ -833,16 +829,12 @@ def test_itimer_prof(self):
signal.signal(signal.SIGPROF, self.sig_prof)
signal.setitimer(self.itimer, 0.2, 0.2)
- for _ in support.busy_retry(support.LONG_TIMEOUT, error=False):
+ for _ in support.busy_retry(support.LONG_TIMEOUT):
# do some work
_ = pow(12345, 67890, 10000019)
if signal.getitimer(self.itimer) == (0.0, 0.0):
# sig_prof handler stopped this itimer
break
- else:
- # bpo-8424
- self.skipTest("timeout: likely cause: machine too slow or load too "
- "high")
# profiling itimer should be (0.0, 0.0) now
self.assertEqual(signal.getitimer(self.itimer), (0.0, 0.0))
@@ -1317,7 +1309,7 @@ def handler(signum, frame):
expected_sigs += 2
# Wait for handlers to run to avoid signal coalescing
- for _ in support.sleeping_retry(support.SHORT_TIMEOUT, error=False):
+ for _ in support.sleeping_retry(support.SHORT_TIMEOUT):
if len(sigs) >= expected_sigs:
break
diff --git a/Lib/test/test_wait3.py b/Lib/test/test_wait3.py
index 15d66ae825abf..eae885a61300b 100644
--- a/Lib/test/test_wait3.py
+++ b/Lib/test/test_wait3.py
@@ -19,7 +19,7 @@ def wait_impl(self, cpid, *, exitcode):
# This many iterations can be required, since some previously run
# tests (e.g. test_ctypes) could have spawned a lot of children
# very quickly.
- for _ in support.sleeping_retry(support.SHORT_TIMEOUT, error=False):
+ for _ in support.sleeping_retry(support.SHORT_TIMEOUT):
# wait3() shouldn't hang, but some of the buildbots seem to hang
# in the forking tests. This is an attempt to fix the problem.
spid, status, rusage = os.wait3(os.WNOHANG)
diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py
index f66c0db1c20e6..67afab1d6f2e3 100644
--- a/Lib/test/test_wait4.py
+++ b/Lib/test/test_wait4.py
@@ -21,7 +21,7 @@ def wait_impl(self, cpid, *, exitcode):
# Issue #11185: wait4 is broken on AIX and will always return 0
# with WNOHANG.
option = 0
- for _ in support.sleeping_retry(support.SHORT_TIMEOUT, error=False):
+ for _ in support.sleeping_retry(support.SHORT_TIMEOUT):
# wait4() shouldn't hang, but some of the buildbots seem to hang
# in the forking tests. This is an attempt to fix the problem.
spid, status, rusage = os.wait4(cpid, option)
More information about the Python-checkins
mailing list