From: elfstrom <elfstrom@users.noreply.github.com>
Date: Tue, 3 Oct 2023 21:59:49 +0000 (+0200)
Subject: gh-109917: Fix test instability in test_concurrent_futures (#110306)
X-Git-Tag: v3.13.0a1~157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a376a72bd92cd7c9930467dd1aba40045fb75e3b;p=thirdparty%2FPython%2Fcpython.git

gh-109917: Fix test instability in test_concurrent_futures (#110306)

The test had an instability issue due to the ordering of the dummy
queue operation and the real wakeup pipe operations. Both primitives
are thread safe but not done atomically as a single update and may
interleave arbitrarily. With the old order of operations this can lead
to an incorrect state where the dummy queue is full but the wakeup
pipe is empty. By swapping the order in clear() I think this can no
longer happen in any possible operation interleaving (famous last
words).
---

diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py
index af702542081a..3c30c4558c0b 100644
--- a/Lib/test/test_concurrent_futures/test_deadlock.py
+++ b/Lib/test/test_concurrent_futures/test_deadlock.py
@@ -286,11 +286,12 @@ class ExecutorDeadlockTest:
                 super().wakeup()
 
             def clear(self):
+                super().clear()
                 try:
                     while True:
                         self._dummy_queue.get_nowait()
                 except queue.Empty:
-                    super().clear()
+                    pass
 
         with (unittest.mock.patch.object(futures.process._ExecutorManagerThread,
                                          'run', mock_run),