Address reviewer feedback

Author: duaneg

Lib/concurrent/futures/process.py

@@ -519,6 +519,7 @@ def flag_executor_shutting_down(self):
                 new_pending_work_items = {}
                 for work_id, work_item in self.pending_work_items.items():
                     if work_item.future.cancel():
+                        # gh-136655: ensure cancelled futures are notified
                         work_item.future.set_running_or_notify_cancel()
                     else:
                         new_pending_work_items[work_id] = work_item

Lib/test/test_concurrent_futures/executor.py

@@ -39,6 +39,16 @@ def __len__(self):
         return 0
 
 
+class CancelNotifyTestException(Exception):
+    pass
+
+
+def blocking_raiser(barrier=None):
+    if barrier is not None:
+        barrier.wait()
+    raise CancelNotifyTestException()
+
+
 class ExecutorTest:
 
     # Executor.shutdown() and context manager usage is tested by
@@ -250,6 +260,7 @@ def test_swallows_falsey_exceptions(self):
 
     @warnings_helper.ignore_fork_in_thread_deprecation_warnings()
     def test_shutdown_notifies_cancelled_futures(self):
+        self.assertGreater(self.worker_count, 1)
 
         # TODO: remove when gh-109934 is fixed
         if self.executor_type is futures.ThreadPoolExecutor:
@@ -271,12 +282,7 @@ def test_shutdown_notifies_cancelled_futures(self):
 
             for future in fs:
                 self.assertRaises(
-                    (FalseyBoolException, futures.CancelledError, threading.BrokenBarrierError),
+                    (CancelNotifyTestException, futures.CancelledError, threading.BrokenBarrierError),
                     future.result)
 
             self.assertIn('CANCELLED_AND_NOTIFIED', [f._state for f in fs])
-
-def blocking_raiser(barrier=None):
-    if barrier is not None:
-        barrier.wait()
-    raise FalseyBoolException()