Fix test_signal on Windows after #12303.

rosslagerwall · rosslagerwall · commit 7f485785dd69 · 2011-06-25T15:03:52.000+02:00
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
@@ -611,7 +611,7 @@ def test_pthread_kill(self):
     @unittest.skipUnless(hasattr(signal, 'pthread_sigmask'),
                          'need signal.pthread_sigmask()')
     @unittest.skipUnless(hasattr(os, 'fork'), 'need os.fork()')
-    def wait_helper(self, test, handler, blocked=signal.SIGALRM):
+    def wait_helper(self, test, handler, blocked):
         signum = signal.SIGALRM
 
         # sig*wait* must be called with the signal blocked: since the current
@@ -651,7 +651,7 @@ def test(signum):
             signal.alarm(1)
             self.assertEqual(signum, signal.sigwait([signum]))
 
-        self.wait_helper(test, self.handler)
+        self.wait_helper(test, self.handler, signal.SIGALRM)
 
     @unittest.skipUnless(hasattr(signal, 'sigwaitinfo'),
                          'need signal.sigwaitinfo()')
@@ -661,7 +661,7 @@ def test(signum):
             info = signal.sigwaitinfo([signum])
             self.assertEqual(signum, info.si_signo)
 
-        self.wait_helper(test, self.handler)
+        self.wait_helper(test, self.handler, signal.SIGALRM)
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
                          'need signal.sigtimedwait()')
@@ -671,7 +671,7 @@ def test(signum):
             info = signal.sigtimedwait([signum], (10, 1000))
             self.assertEqual(signum, info.si_signo)
 
-        self.wait_helper(test, self.handler)
+        self.wait_helper(test, self.handler, signal.SIGALRM)
 
     # check that polling with sigtimedwait works
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
@@ -682,15 +682,15 @@ def test(signum):
             info = signal.sigtimedwait([signum], (0, 0))
             self.assertEqual(signum, info.si_signo)
 
-        self.wait_helper(test, self.handler)
+        self.wait_helper(test, self.handler, signal.SIGALRM)
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
                          'need signal.sigtimedwait()')
     def test_sigtimedwait_timeout(self):
         def test(signum):
             self.assertEqual(None, signal.sigtimedwait([signum], (1, 35500)))
 
-        self.wait_helper(test, self.handler)
+        self.wait_helper(test, self.handler, signal.SIGALRM)
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
                          'need signal.sigtimedwait()')
