Merged revisions 83763 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83763 | brian.curtin | 2010-08-06 14:27:32 -0500 (Fri, 06 Aug 2010) | 3 lines
Fix #9324: Add parameter validation to signal.signal on Windows in order
to prevent crashes.
........
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index a246695..a7ce52b2 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -9,7 +9,7 @@
import traceback
import sys, os, time, errno
-if sys.platform[:3] in ('win', 'os2') or sys.platform == 'riscos':
+if sys.platform == 'os2' or sys.platform == 'riscos':
raise unittest.SkipTest("Can't test signal on %s" % \
sys.platform)
@@ -37,6 +37,7 @@
return None
+@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
class InterProcessSignalTests(unittest.TestCase):
MAX_DURATION = 20 # Entire test should last at most 20 sec.
@@ -186,6 +187,7 @@
self.MAX_DURATION)
+@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
class BasicSignalTests(unittest.TestCase):
def trivial_signal_handler(self, *args):
pass
@@ -208,6 +210,23 @@
self.assertEquals(signal.getsignal(signal.SIGHUP), hup)
+@unittest.skipUnless(sys.platform == "win32", "Windows specific")
+class WindowsSignalTests(unittest.TestCase):
+ def test_issue9324(self):
+ handler = lambda x, y: None
+ signal.signal(signal.SIGABRT, handler)
+ signal.signal(signal.SIGFPE, handler)
+ signal.signal(signal.SIGILL, handler)
+ signal.signal(signal.SIGINT, handler)
+ signal.signal(signal.SIGSEGV, handler)
+ signal.signal(signal.SIGTERM, handler)
+
+ with self.assertRaises(ValueError):
+ signal.signal(-1, handler)
+ sinal.signal(7, handler)
+
+
+@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
class WakeupSignalTests(unittest.TestCase):
TIMEOUT_FULL = 10
TIMEOUT_HALF = 5
@@ -253,14 +272,15 @@
os.close(self.write)
signal.signal(signal.SIGALRM, self.alrm)
+@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
class SiginterruptTest(unittest.TestCase):
- signum = signal.SIGUSR1
def setUp(self):
"""Install a no-op signal handler that can be set to allow
interrupts or not, and arrange for the original signal handler to be
re-installed when the test is finished.
"""
+ self.signum = signal.SIGUSR1
oldhandler = signal.signal(self.signum, lambda x,y: None)
self.addCleanup(signal.signal, self.signum, oldhandler)
@@ -354,7 +374,7 @@
self.assertFalse(i)
-
+@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
class ItimerTest(unittest.TestCase):
def setUp(self):
self.hndl_called = False
@@ -463,8 +483,11 @@
self.assertEqual(self.hndl_called, True)
def test_main():
- support.run_unittest(BasicSignalTests, InterProcessSignalTests,
- WakeupSignalTests, SiginterruptTest, ItimerTest)
+ if sys.platform == "win32":
+ support.run_unittest(WindowsSignalTests)
+ else:
+ support.run_unittest(BasicSignalTests, InterProcessSignalTests,
+ WakeupSignalTests, SiginterruptTest, ItimerTest)
if __name__ == "__main__":