summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-02-26 13:11:11 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2013-02-26 13:11:11 (GMT)
commit0320025f1782ae33584fe4137bf0018fde98f467 (patch)
tree5cb669bc7761f5e1e800dd9d412cae94c77594f3 /Lib/test
parent139a63fb85397e8051697adff053d0dc3fef37f9 (diff)
parent5b8a3242c41a66e4853449bbf52cba667ce4bbe9 (diff)
downloadcpython-0320025f1782ae33584fe4137bf0018fde98f467.zip
cpython-0320025f1782ae33584fe4137bf0018fde98f467.tar.gz
cpython-0320025f1782ae33584fe4137bf0018fde98f467.tar.bz2
Merge
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_multiprocessing.py32
1 files changed, 32 insertions, 0 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 07bfe2f..54ef7bf 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -2869,6 +2869,38 @@ class _TestLogging(BaseTestCase):
# assert self.__handled
#
+# Check that Process.join() retries if os.waitpid() fails with EINTR
+#
+
+class _TestPollEintr(BaseTestCase):
+
+ ALLOWED_TYPES = ('processes',)
+
+ @classmethod
+ def _killer(cls, pid):
+ time.sleep(0.5)
+ os.kill(pid, signal.SIGUSR1)
+
+ @unittest.skipUnless(hasattr(signal, 'SIGUSR1'), 'requires SIGUSR1')
+ def test_poll_eintr(self):
+ got_signal = [False]
+ def record(*args):
+ got_signal[0] = True
+ pid = os.getpid()
+ oldhandler = signal.signal(signal.SIGUSR1, record)
+ try:
+ killer = self.Process(target=self._killer, args=(pid,))
+ killer.start()
+ p = self.Process(target=time.sleep, args=(1,))
+ p.start()
+ p.join()
+ self.assertTrue(got_signal[0])
+ self.assertEqual(p.exitcode, 0)
+ killer.join()
+ finally:
+ signal.signal(signal.SIGUSR1, oldhandler)
+
+#
# Test to verify handle verification, see issue 3321
#