Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge

This commit is contained in:
Christian Heimes 2013-10-13 02:22:10 +02:00
parent bf235bd212 7b4a36194a
commit 06239f62b0
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/_test_multiprocessing.py
View File

@ -273,7 +273,7 @@ class _TestProcess(BaseTestCase):
@classmethod @classmethod
def _test_terminate(cls): def _test_terminate(cls):
time.sleep(1000) time.sleep(100)
def test_terminate(self): def test_terminate(self):
if self.TYPE == 'threads': if self.TYPE == 'threads':
@ -299,7 +299,19 @@ class _TestProcess(BaseTestCase):
p.terminate() p.terminate()
self.assertEqual(join(), None) if hasattr(signal, 'alarm'):
def handler(*args):
raise RuntimeError('join took too long: pid=%s' % p.pid)
old_handler = signal.signal(signal.SIGALRM, handler)
try:
signal.alarm(10)
self.assertEqual(join(), None)
signal.alarm(0)
finally:
signal.signal(signal.SIGALRM, old_handler)
else:
self.assertEqual(join(), None)
self.assertTimingAlmostEqual(join.elapsed, 0.0) self.assertTimingAlmostEqual(join.elapsed, 0.0)
self.assertEqual(p.is_alive(), False) self.assertEqual(p.is_alive(), False)