python
diff --git a/‎Lib/test/_test_multiprocessing.py
Copy file name to clipboardExpand all lines: Lib/test/_test_multiprocessing.py
+35-36Lines changed: 35 additions & 36 deletions b/‎Lib/test/_test_multiprocessing.py
Copy file name to clipboardExpand all lines: Lib/test/_test_multiprocessing.py
+35-36Lines changed: 35 additions & 36 deletions
@@ -958,42 +958,6 @@ def queue_full(q, maxsize):
 
 class _TestQueue(BaseTestCase):
 
-    # TODO: add queue shutdown unit-tests
-
-    def test_shutdown_empty(self):
-        q = self.type2test()
-        q.shutdown()
-        try:
-            q.put("data")
-            self.fail("Didn't appear to shut-down queue")
-        except self.queue.ShutDown:
-            pass
-        try:
-            q.get()
-            self.fail("Didn't appear to shut-down queue")
-        except self.queue.ShutDown:
-            pass
-
-    def test_shutdown_nonempty(self):
-        q = self.type2test()
-        q.put("data")
-        q.shutdown()
-        q.get()
-        try:
-            q.get()
-            self.fail("Didn't appear to shut-down queue")
-        except self.queue.ShutDown:
-            pass
-
-    def test_shutdown_immediate(self):
-        q = self.type2test()
-        q.put("data")
-        q.shutdown(immediate=True)
-        try:
-            q.get()
-            self.fail("Didn't appear to shut-down queue")
-        except self.queue.ShutDown:
-            pass
 
     @classmethod
     def _test_put(cls, queue, child_can_start, parent_can_continue):
@@ -1313,6 +1277,41 @@ def test_closed_queue_put_get_exceptions(self):
                 q.put('foo')
             with self.assertRaisesRegex(ValueError, 'is closed'):
                 q.get()
+
+    def test_shutdown_empty(self):
+        q = multiprocessing.Queue()
+        q.shutdown()
+        try:
+            q.put("data")
+            self.fail("Didn't appear to shut-down queue")
+        except pyqueue.ShutDown:
+            pass
+        try:
+            q.get()
+            self.fail("Didn't appear to shut-down queue")
+        except pyqueue.ShutDown:
+            pass
+
+    def test_shutdown_nonempty(self):
+        q = multiprocessing.Queue()
+        q.put("data")
+        q.shutdown()
+        q.get()
+        try:
+            q.get()
+            self.fail("Didn't appear to shut-down queue")
+        except pyqueue.ShutDown:
+            pass
+
+    def test_shutdown_immediate(self):
+        q = multiprocessing.Queue()
+        q.put("data")
+        q.shutdown(immediate=True)
+        try:
+            q.get()
+            self.fail("Didn't appear to shut-down queue")
+        except pyqueue.ShutDown:
+            pass
 #
 #
 #