From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 31 Mar 2012 18:25:22 +0000 (+0200)
Subject: Issue #14406: Fix a race condition when using `concurrent.futures.wait(return_when... 
X-Git-Tag: v3.3.0a2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b34b53c52ce604bc48b39f83089cd404201de1b;p=thirdparty%2FPython%2Fcpython.git

Issue #14406: Fix a race condition when using `concurrent.futures.wait(return_when=ALL_COMPLETED)`.
Patch by Matt Joiner.
---

8b34b53c52ce604bc48b39f83089cd404201de1b
diff --cc Lib/test/test_concurrent_futures.py
index 04ee246083ec,2afa93802e26..6ae450df066e
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@@ -180,10 -180,12 +180,12 @@@ class ProcessPoolShutdownTest(ProcessPo
          del executor
  
          queue_management_thread.join()
 -        for p in processes:
 +        for p in processes.values():
              p.join()
  
+ 
  class WaitTests(unittest.TestCase):
+ 
      def test_first_completed(self):
          future1 = self.executor.submit(mul, 21, 2)
          future2 = self.executor.submit(time.sleep, 1.5)
diff --cc Misc/NEWS
index 5c93c0a7921c,d814b17ff9c7..4e8515b1019d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -37,8 -31,9 +37,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #14406: Fix a race condition when using ``concurrent.futures.wait(
+   return_when=ALL_COMPLETED)``.  Patch by Matt Joiner.
+ 
 +- Issue #5136: deprecate old, unused functions from tkinter.
 +
  - Issue #14409: IDLE now properly executes commands in the Shell window
    when it cannot read the normal config files on startup and
    has to use the built-in default key bindings.