From: Brian Curtin <brian.curtin@gmail.com>
Date: Sat, 7 Aug 2010 03:52:38 +0000 (+0000)
Subject: Merged revisions 83771 via svnmerge from
X-Git-Tag: v3.1.3rc1~381
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80cd4bff53fab28a15fef40e2479a455aa5b400e;p=python

Merged revisions 83771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83771 | brian.curtin | 2010-08-06 22:47:21 -0500 (Fri, 06 Aug 2010) | 3 lines

  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.
........
---

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index a7ce52b231..a00e2d8621 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__":