[Python-checkins] cpython: Fix test_signal on Windows after #12303.

[ross.lagerwall]

http://hg.python.org/cpython/rev/768234f5c246
changeset:   70971:768234f5c246
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Sat Jun 25 15:03:52 2011 +0200
summary:
  Fix test_signal on Windows after #12303.

files:
  Lib/test/test_signal.py |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -611,7 +611,7 @@
     @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 @@
             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 @@
             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 @@
             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,7 +682,7 @@
             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()')
@@ -690,7 +690,7 @@
         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()')

-- 
Repository URL: http://hg.python.org/cpython