mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.13] gh-130737: Fix multiprocessing test_notify() (GH-130797) (#130802)

Browse source 
gh-130737: Fix multiprocessing test_notify() (GH-130797)

Replace hardcoded delay (100 ms) with a loop awaiting until a
condition is true: replace assertReturnsIfImplemented() with
assertReachesEventually().

Use sleeping_retry() in assertReachesEventually() to tolerate slow
buildbots and raise an exception on timeout (30 seconds).
(cherry picked from commit 8a64a62002)

Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
Miss Islington (bot) 2025-03-03 20:09:34 +01:00 • committed by GitHub
parent 4c6318e24d
commit d00e92bc04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/_test_multiprocessing.py
View file

@ -1577,14 +1577,13 @@ class _TestCondition(BaseTestCase):
cond.release() cond.release()
def assertReachesEventually(self, func, value): def assertReachesEventually(self, func, value):
for i in range(10): for _ in support.sleeping_retry(support.SHORT_TIMEOUT):
try: try:
if func() == value: if func() == value:
break break
except NotImplementedError: except NotImplementedError:
break break
time.sleep(DELTA)
time.sleep(DELTA)
self.assertReturnsIfImplemented(value, func) self.assertReturnsIfImplemented(value, func)
def check_invariant(self, cond): def check_invariant(self, cond):
@ -1618,8 +1617,7 @@ class _TestCondition(BaseTestCase):
sleeping.acquire() sleeping.acquire()
# check no process/thread has woken up # check no process/thread has woken up
time.sleep(DELTA) self.assertReachesEventually(lambda: get_value(woken), 0)
self.assertReturnsIfImplemented(0, get_value, woken)
# wake up one process/thread # wake up one process/thread
cond.acquire() cond.acquire()
@ -1627,8 +1625,7 @@ class _TestCondition(BaseTestCase):
cond.release() cond.release()
# check one process/thread has woken up # check one process/thread has woken up
time.sleep(DELTA) self.assertReachesEventually(lambda: get_value(woken), 1)
self.assertReturnsIfImplemented(1, get_value, woken)
# wake up another # wake up another
cond.acquire() cond.acquire()
@ -1636,8 +1633,7 @@ class _TestCondition(BaseTestCase):
cond.release() cond.release()
# check other has woken up # check other has woken up
time.sleep(DELTA) self.assertReachesEventually(lambda: get_value(woken), 2)
self.assertReturnsIfImplemented(2, get_value, woken)
# check state is not mucked up # check state is not mucked up
self.check_invariant(cond) self.check_invariant(cond)