mirror of https://github.com/python/cpython
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. ........
This commit is contained in:
parent
27e19a21b1
commit
9d310d3581
|
@ -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":
|
||||
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__":
|
||||
|
|
Loading…
Reference in New Issue