https://github.com/python/cpython/commit/edd1eca336976b3431cf636aea87f08a40c94935
commit: edd1eca336976b3431cf636aea87f08a40c94935
branch: main
author: Sam Gross <[email protected]>
committer: colesbury <[email protected]>
date: 2025-03-08T13:04:30-05:00
summary:
gh-130954: Fix multiprocessing test_notify_n (#130955)
The test could deadlock trying join on the worker processes.
Apply the same technique as gh-130933.
Join the process before the test ends in `test_notify` as well.
files:
M Lib/test/_test_multiprocessing.py
diff --git a/Lib/test/_test_multiprocessing.py
b/Lib/test/_test_multiprocessing.py
index 10c17b2dc7d32b..dcce57629efe5b 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -1654,12 +1654,10 @@ def test_notify(self):
p = self.Process(target=self.f, args=(cond, sleeping, woken))
p.daemon = True
p.start()
- self.addCleanup(p.join)
- p = threading.Thread(target=self.f, args=(cond, sleeping, woken))
- p.daemon = True
- p.start()
- self.addCleanup(p.join)
+ t = threading.Thread(target=self.f, args=(cond, sleeping, woken))
+ t.daemon = True
+ t.start()
# wait for both children to start sleeping
sleeping.acquire()
@@ -1686,7 +1684,9 @@ def test_notify(self):
# check state is not mucked up
self.check_invariant(cond)
- p.join()
+
+ threading_helper.join_thread(t)
+ join_process(p)
def test_notify_all(self):
cond = self.Condition()
@@ -1763,16 +1763,17 @@ def test_notify_n(self):
woken = self.Semaphore(0)
# start some threads/processes
+ workers = []
for i in range(3):
p = self.Process(target=self.f, args=(cond, sleeping, woken))
p.daemon = True
p.start()
- self.addCleanup(p.join)
+ workers.append(p)
t = threading.Thread(target=self.f, args=(cond, sleeping, woken))
t.daemon = True
t.start()
- self.addCleanup(t.join)
+ workers.append(t)
# wait for them to all sleep
for i in range(6):
@@ -1807,6 +1808,10 @@ def test_notify_n(self):
# check state is not mucked up
self.check_invariant(cond)
+ for w in workers:
+ # NOTE: join_process and join_thread are the same
+ threading_helper.join_thread(w)
+
def test_timeout(self):
cond = self.Condition()
wait = TimingWrapper(cond.wait)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
