WIP: fix threading queue shutdown all-methods-many-threads test (#115258)

EpicWink · EpicWink · commit 57a809516ec7 · 2024-02-21T20:52:52.000+10:00
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
@@ -324,7 +324,6 @@ def _shutdown_all_methods_in_many_threads(self, immediate):
         start_puts = threading.Event()
         start_gets = threading.Event()
         put = threading.Event()
-        shutdown = threading.Event()
 
         n_gets_lock = threading.Lock()
         n_gets = 0
@@ -358,10 +357,9 @@ def put_worker():
                 _record_call(q.put, i)
                 put.clear()
 
-            shutdown.set()
+            _record_call(q.shutdown, immediate)
 
             # Should raise ShutDown
-            put.wait()
             _record_call(q.put, 25)
 
         def get_worker():
@@ -376,7 +374,9 @@ def get_worker():
                     n_gets += 1
 
                 put.set()
-                _record_call(q.get, False)
+                _record_call(q.get)
+
+                q.task_done()
 
             put.set()
             _record_call(q.get, False)  # should raise ShutDown if immediate
@@ -386,10 +386,6 @@ def join_worker():
             _record_call(q.join)
             queue_size_after_join.append(q.qsize())
 
-        def shutdown_worker():
-            shutdown.wait()
-            _record_call(q.shutdown, immediate)
-
         def _start_thread(f):
             thread = threading.Thread(target=_record_result, args=(f,))
             thread.start()
@@ -399,12 +395,10 @@ def _start_thread(f):
             _start_thread(put_worker),
             *(_start_thread(get_worker) for _ in range(4)),
             *(_start_thread(join_worker) for _ in range(2)),
-            _start_thread(shutdown_worker),
         ]
 
         # Act
         start_puts.set()
-        shutdown.wait()
         for thread in threads:
             thread.join()
 
@@ -439,11 +433,6 @@ def _start_thread(f):
         join_worker_results = [r for f, r in results if f is join_worker]
         self.assertListEqual(join_worker_results, [None, None])
 
-        shutdown_worker_result = next(
-            r for f, r in results if f is shutdown_worker
-        )
-        self.assertIsNone(shutdown_worker_result, None)
-
     def test_shutdown_all_methods_in_many_threads(self):
         return self._shutdown_all_methods_in_many_threads(False)
 
