summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-08-07 03:47:21 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-08-07 03:47:21 (GMT)
commit42143562c2f5a716cd24c83e2dbe4b7e5e9a6d6d (patch)
tree18e10379fb2a2f129af2eda046e3fb9f816d889b
parent86f96139574e7b921a6c12b4352beae62d9a26f8 (diff)
downloadcpython-42143562c2f5a716cd24c83e2dbe4b7e5e9a6d6d.zip
cpython-42143562c2f5a716cd24c83e2dbe4b7e5e9a6d6d.tar.gz
cpython-42143562c2f5a716cd24c83e2dbe4b7e5e9a6d6d.tar.bz2
Fix an assertRaises situation and typo. Also pass all tests to run_unittest
rather than do it by platform -- the proper skips are in place already.
-rw-r--r--Lib/test/test_signal.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index a7ce52b2..a00e2d8 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -223,7 +223,9 @@ class WindowsSignalTests(unittest.TestCase):
with self.assertRaises(ValueError):
signal.signal(-1, handler)
- sinal.signal(7, handler)
+
+ with self.assertRaises(ValueError):
+ signal.signal(7, handler)
@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
@@ -483,11 +485,9 @@ class ItimerTest(unittest.TestCase):
self.assertEqual(self.hndl_called, True)
def test_main():
- if sys.platform == "win32":
- support.run_unittest(WindowsSignalTests)
- else:
- support.run_unittest(BasicSignalTests, InterProcessSignalTests,
- WakeupSignalTests, SiginterruptTest, ItimerTest)
+ support.run_unittest(BasicSignalTests, InterProcessSignalTests,
+ WakeupSignalTests, SiginterruptTest,
+ ItimerTest, WindowsSignalTests)
if __name__ == "__main__":