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

Merge.

This commit is contained in:
Richard Oudkerk 2013-10-13 00:52:21 +01:00
parent 84fc7081f5 4f35079858
commit 7b4a36194a
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
def _test_terminate(cls):
time.sleep(1000)
time.sleep(100)
def test_terminate(self):
if self.TYPE == 'threads':
@ -299,7 +299,19 @@ class _TestProcess(BaseTestCase):
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.assertEqual(p.is_alive(), False)