mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix signal handler in test.

Browse source
This commit is contained in:
Richard Oudkerk 2013-10-17 15:22:10 +01:00
parent 240f86d7dd
commit cc5c728513
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/_test_multiprocessing.py
View file

@ -354,12 +354,16 @@ class _TestProcess(BaseTestCase):
else: else:
os.kill(pid, signal.SIGTERM) os.kill(pid, signal.SIGTERM)
def handler(*args): def handler(*args):
raise RuntimeError('join took too long: %s' % p) raise RuntimeError('waitpid() took too long')
old_handler = signal.signal(signal.SIGALRM, handler) old_handler = signal.signal(signal.SIGALRM, handler)
try: try:
signal.alarm(10) signal.alarm(10)
pid_status = os.waitpid(pid, 0) pid_status = os.waitpid(pid, 0)
self.assertEqual(pid_status[0], pid) self.assertEqual(pid_status[0], pid)
except RuntimeError:
print('os.waitpid() =',
os.waitpid(pid, os.WNOHANG), file=sys.stderr)
raise
finally: finally:
signal.alarm(0) signal.alarm(0)
signal.signal(signal.SIGALRM, old_handler) signal.signal(signal.SIGALRM, old_handler)