Skip to content

Commit 624ace5

Browse files
gh-111284: Make multiprocessing tests with threads faster and more reliable (GH-111285)
1 parent 55df2de commit 624ace5

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

Lib/test/_test_multiprocessing.py

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,8 +2438,11 @@ def test_namespace(self):
24382438
#
24392439
#
24402440

2441-
def sqr(x, wait=0.0):
2442-
time.sleep(wait)
2441+
def sqr(x, wait=0.0, event=None):
2442+
if event is None:
2443+
time.sleep(wait)
2444+
else:
2445+
event.wait(wait)
24432446
return x*x
24442447

24452448
def mul(x, y):
@@ -2578,10 +2581,18 @@ def test_async(self):
25782581
self.assertTimingAlmostEqual(get.elapsed, TIMEOUT1)
25792582

25802583
def test_async_timeout(self):
2581-
res = self.pool.apply_async(sqr, (6, TIMEOUT2 + support.SHORT_TIMEOUT))
2582-
get = TimingWrapper(res.get)
2583-
self.assertRaises(multiprocessing.TimeoutError, get, timeout=TIMEOUT2)
2584-
self.assertTimingAlmostEqual(get.elapsed, TIMEOUT2)
2584+
p = self.Pool(3)
2585+
try:
2586+
event = threading.Event() if self.TYPE == 'threads' else None
2587+
res = p.apply_async(sqr, (6, TIMEOUT2 + support.SHORT_TIMEOUT, event))
2588+
get = TimingWrapper(res.get)
2589+
self.assertRaises(multiprocessing.TimeoutError, get, timeout=TIMEOUT2)
2590+
self.assertTimingAlmostEqual(get.elapsed, TIMEOUT2)
2591+
finally:
2592+
if event is not None:
2593+
event.set()
2594+
p.terminate()
2595+
p.join()
25852596

25862597
def test_imap(self):
25872598
it = self.pool.imap(sqr, list(range(10)))
@@ -2683,10 +2694,11 @@ def test_make_pool(self):
26832694

26842695
def test_terminate(self):
26852696
# Simulate slow tasks which take "forever" to complete
2697+
p = self.Pool(3)
26862698
args = [support.LONG_TIMEOUT for i in range(10_000)]
2687-
result = self.pool.map_async(time.sleep, args, chunksize=1)
2688-
self.pool.terminate()
2689-
self.pool.join()
2699+
result = p.map_async(time.sleep, args, chunksize=1)
2700+
p.terminate()
2701+
p.join()
26902702

26912703
def test_empty_iterable(self):
26922704
# See Issue 12157

0 commit comments

Comments
 (0)