merge 3.3 (#19112)

Lib/test/_test_multiprocessing.py

@@ -3044,13 +3044,6 @@ def _ThisSubProcess(q):
     except pyqueue.Empty:
         pass
 
-def _TestProcess(q):
-    queue = multiprocessing.Queue()
-    subProc = multiprocessing.Process(target=_ThisSubProcess, args=(queue,))
-    subProc.daemon = True
-    subProc.start()
-    subProc.join()
-
 def _afunc(x):
     return x*x
 
@@ -3084,6 +3077,12 @@ class _file_like(object):
 class TestStdinBadfiledescriptor(unittest.TestCase):
 
     def test_queue_in_process(self):
+        def _TestProcess(q):
+            queue = multiprocessing.Queue()
+            subProc = multiprocessing.Process(target=_ThisSubProcess, args=(queue,))
+            subProc.daemon = True
+            subProc.start()
+            subProc.join()
         queue = multiprocessing.Queue()
         proc = multiprocessing.Process(target=_TestProcess, args=(queue,))
         proc.start()