summaryrefslogtreecommitdiff
path: root/Lib/test/test_multiprocessing.py
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2012-12-31 17:38:46 +0100
committerGiampaolo Rodola' <g.rodola@gmail.com>2012-12-31 17:38:46 +0100
commitb4f39e85f2199bb9344e9b49feed3f6a45a318de (patch)
treed9afc3d38ed409698be1cb3e5a4aab1c5d568372 /Lib/test/test_multiprocessing.py
parent8d518970ce30387db8168ea45402a871167562df (diff)
parent5051ca887c82506a9dcf8b71e0e6890f9e0e1589 (diff)
downloadcpython-git-b4f39e85f2199bb9344e9b49feed3f6a45a318de.tar.gz
Fix issue 10527: make multiprocessing use poll() instead of select() if available.
Diffstat (limited to 'Lib/test/test_multiprocessing.py')
-rw-r--r--Lib/test/test_multiprocessing.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 9ec0be2a70..d973b44b73 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -2102,6 +2102,7 @@ class _TestConnection(BaseTestCase):
self.assertTimingAlmostEqual(poll.elapsed, TIMEOUT1)
conn.send(None)
+ time.sleep(.1)
self.assertEqual(poll(TIMEOUT1), True)
self.assertTimingAlmostEqual(poll.elapsed, 0)
@@ -3251,6 +3252,7 @@ class TestWait(unittest.TestCase):
from multiprocessing.connection import wait
expected = 3
+ sorted_ = lambda l: sorted(l, key=lambda x: isinstance(x, int))
sem = multiprocessing.Semaphore(0)
a, b = multiprocessing.Pipe()
p = multiprocessing.Process(target=self.signal_and_sleep,
@@ -3274,7 +3276,7 @@ class TestWait(unittest.TestCase):
res = wait([a, p.sentinel, b], 20)
delta = time.time() - start
- self.assertEqual(res, [p.sentinel, b])
+ self.assertEqual(sorted_(res), sorted_([p.sentinel, b]))
self.assertLess(delta, 0.4)
b.send(None)
@@ -3283,7 +3285,7 @@ class TestWait(unittest.TestCase):
res = wait([a, p.sentinel, b], 20)
delta = time.time() - start
- self.assertEqual(res, [a, p.sentinel, b])
+ self.assertEqual(sorted_(res), sorted_([a, p.sentinel, b]))
self.assertLess(delta, 0.4)
p.terminate()