From 174ba000500b38974336eb6052c78e2a6b0c36f3 Mon Sep 17 00:00:00 2001 From: Stefan Krah Date: Sat, 15 May 2010 09:45:07 +0000 Subject: [PATCH] Merged revisions 81188 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81188 | stefan.krah | 2010-05-15 11:41:27 +0200 (Sat, 15 May 2010) | 10 lines Merged revisions 81185 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81185 | stefan.krah | 2010-05-15 11:31:08 +0200 (Sat, 15 May 2010) | 4 lines If the timeout is exceeded, count the tests as skipped instead of just issuing a warning. ........ ................ --- Lib/test/test_signal.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 6463f8ec5e8..ade339a27fc 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -431,9 +431,8 @@ class ItimerTest(unittest.TestCase): if signal.getitimer(self.itimer) == (0.0, 0.0): break # sig_vtalrm handler stopped this itimer else: # Issue 8424 - sys.stdout.write("test_itimer_virtual: timeout: likely cause: " - "machine too slow or load too high.\n") - return + raise unittest.SkipTest("timeout: likely cause: machine too slow " + "or load too high") # virtual itimer should be (0.0, 0.0) now self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0)) @@ -455,9 +454,8 @@ class ItimerTest(unittest.TestCase): if signal.getitimer(self.itimer) == (0.0, 0.0): break # sig_prof handler stopped this itimer else: # Issue 8424 - sys.stdout.write("test_itimer_prof: timeout: likely cause: " - "machine too slow or load too high.\n") - return + raise unittest.SkipTest("timeout: likely cause: machine too slow " + "or load too high") # profiling itimer should be (0.0, 0.0) now self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0))