python
diff --git a/‎Lib/test/test_queue.py
Copy file name to clipboardExpand all lines: Lib/test/test_queue.py
+11-6Lines changed: 11 additions & 6 deletions b/‎Lib/test/test_queue.py
Copy file name to clipboardExpand all lines: Lib/test/test_queue.py
+11-6Lines changed: 11 additions & 6 deletions
@@ -567,7 +567,6 @@ def _shutdown_put_join(self, immediate):
         results = []
         go = threading.Event()
         q.put("Y")
-        nb = q.qsize()
         # queue not fulled
 
         thrds = (
@@ -578,13 +577,19 @@ def _shutdown_put_join(self, immediate):
         for func, params in thrds:
             threads.append(threading.Thread(target=func, args=params))
             threads[-1].start()
-        self.assertEqual(q.unfinished_tasks, nb)
-        for i in range(nb):
-            t = threading.Thread(target=q.task_done)
-            t.start()
-            threads.append(t)
+        self.assertEqual(q.unfinished_tasks, 1)
+
         q.shutdown(immediate)
         go.set()
+
+        if immediate:
+            with self.assertRaises(self.queue.ShutDown):
+                q.get_nowait()
+        else:
+            result = q.get()
+            self.assertEqual(result, "Y")
+            q.task_done()
+
         for t in threads:
             t.join()