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

bpo-35426: Eliminate race condition in test_interprocess_signal (GH-11087)

Browse source 
The test only except SIGUSR1Exception inside wait_signal(), but the signal can be sent during subprocess_send_signal() call.
This commit is contained in:
Pablo Galindo 2018-12-11 11:32:12 +00:00 • committed by GitHub
parent a932d0b496
commit 2ab2afd387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/signalinterproctester.py
View file

@ -21,8 +21,7 @@ class InterProcessSignalTests(unittest.TestCase):
self.got_signals['SIGUSR1'] += 1 self.got_signals['SIGUSR1'] += 1
raise SIGUSR1Exception raise SIGUSR1Exception
def wait_signal(self, child, signame, exc_class=None): def wait_signal(self, child, signame):
try:
if child is not None: if child is not None:
# This wait should be interrupted by exc_class # This wait should be interrupted by exc_class
# (if set) # (if set)
@ -35,11 +34,6 @@ class InterProcessSignalTests(unittest.TestCase):
if self.got_signals[signame]: if self.got_signals[signame]:
return return
signal.pause() signal.pause()
except BaseException as exc:
if exc_class is not None and isinstance(exc, exc_class):
# got the expected exception
return
raise
self.fail('signal %s not received after %s seconds' self.fail('signal %s not received after %s seconds'
% (signame, timeout)) % (signame, timeout))
@ -65,8 +59,9 @@ class InterProcessSignalTests(unittest.TestCase):
self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 0, self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 0,
'SIGALRM': 0}) 'SIGALRM': 0})
with self.assertRaises(SIGUSR1Exception):
with self.subprocess_send_signal(pid, "SIGUSR1") as child: with self.subprocess_send_signal(pid, "SIGUSR1") as child:
self.wait_signal(child, 'SIGUSR1', SIGUSR1Exception) self.wait_signal(child, 'SIGUSR1')
self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1, self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1,
'SIGALRM': 0}) 'SIGALRM': 0})
@ -75,8 +70,9 @@ class InterProcessSignalTests(unittest.TestCase):
child.wait() child.wait()
try: try:
with self.assertRaises(KeyboardInterrupt):
signal.alarm(1) signal.alarm(1)
self.wait_signal(None, 'SIGALRM', KeyboardInterrupt) self.wait_signal(None, 'SIGALRM')
self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1, self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1,
'SIGALRM': 0}) 'SIGALRM': 0})
finally: finally: