summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_multiprocessing.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 35d85d7..0db6352 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -2494,20 +2494,20 @@ class TestWait(unittest.TestCase):
w.close()
def test_wait(self, slow=False):
- from multiprocessing import Pipe, Process
from multiprocessing.connection import wait
readers = []
procs = []
messages = []
for i in range(4):
- r, w = Pipe(duplex=False)
- p = Process(target=self._child_test_wait, args=(w, slow))
+ r, w = multiprocessing.Pipe(duplex=False)
+ p = multiprocessing.Process(target=self._child_test_wait, args=(w, slow))
p.daemon = True
p.start()
w.close()
readers.append(r)
procs.append(p)
+ self.addCleanup(p.join)
while readers:
for r in wait(readers):
@@ -2534,7 +2534,6 @@ class TestWait(unittest.TestCase):
s.close()
def test_wait_socket(self, slow=False):
- from multiprocessing import Process
from multiprocessing.connection import wait
l = socket.socket()
l.bind(('', 0))
@@ -2545,10 +2544,12 @@ class TestWait(unittest.TestCase):
dic = {}
for i in range(4):
- p = Process(target=self._child_test_wait_socket, args=(addr, slow))
+ p = multiprocessing.Process(target=self._child_test_wait_socket,
+ args=(addr, slow))
p.daemon = True
p.start()
procs.append(p)
+ self.addCleanup(p.join)
for i in range(4):
r, _ = l.accept()