[Python-checkins] r83773 - in python/branches/release27-maint: Lib/test/test_signal.py
brian.curtin
python-checkins at python.org
Sat Aug 7 05:56:16 CEST 2010
Author: brian.curtin
Date: Sat Aug 7 05:56:16 2010
New Revision: 83773
Log:
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.
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Lib/test/test_signal.py
Modified: python/branches/release27-maint/Lib/test/test_signal.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_signal.py (original)
+++ python/branches/release27-maint/Lib/test/test_signal.py Sat Aug 7 05:56:16 2010
@@ -223,7 +223,9 @@
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 @@
self.assertEqual(self.hndl_called, True)
def test_main():
- if sys.platform == "win32":
- test_support.run_unittest(WindowsSignalTests)
- else:
- test_support.run_unittest(BasicSignalTests, InterProcessSignalTests,
- WakeupSignalTests, SiginterruptTest, ItimerTest)
+ test_support.run_unittest(BasicSignalTests, InterProcessSignalTests,
+ WakeupSignalTests, SiginterruptTest,
+ ItimerTest, WindowsSignalTests)
if __name__ == "__main__":
More information about the Python-checkins
mailing list