Skip to content

Commit ffdcb27

Browse files
committed
Catch BrokenBarrierError in another place it can be thrown and mention the
ProcessPoolExecutor in NEWS.
1 parent df11bf3 commit ffdcb27

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

Lib/test/test_concurrent_futures/executor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,9 @@ def test_shutdown_notifies_cancelled_futures(self):
249249
pass
250250

251251
for future in fs:
252-
self.assertRaises((FalseyBoolException, futures.CancelledError),
253-
future.result)
252+
self.assertRaises(
253+
(FalseyBoolException, futures.CancelledError, threading.BrokenBarrierError),
254+
future.result)
254255

255256
self.assertIn('CANCELLED_AND_NOTIFIED', [f._state for f in fs])
256257

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
Ensure :class:`concurrent.futures.ThreadPoolExecutor` notifies any futures
2-
it cancels on shutdown.
1+
Ensure :class:`concurrent.futures.ThreadPoolExecutor` and
2+
:class:`concurrent.futures.ProcessPoolExecutor` notifies any futures it cancels
3+
on shutdown.

0 commit comments

Comments
 (0)