diff options
| author | Stefan Krah <stefan@bytereef.org> | 2010-05-15 09:45:07 (GMT) |
|---|---|---|
| committer | Stefan Krah <stefan@bytereef.org> | 2010-05-15 09:45:07 (GMT) |
| commit | 174ba000500b38974336eb6052c78e2a6b0c36f3 (patch) | |
| tree | 53adaed8aab62a68c794628704bd5b66bf51c4ca /Lib/test | |
| parent | 1f7122d4261bb695a477201f94f1cf4dab4e7176 (diff) | |
| download | cpython-174ba000500b38974336eb6052c78e2a6b0c36f3.zip cpython-174ba000500b38974336eb6052c78e2a6b0c36f3.tar.gz cpython-174ba000500b38974336eb6052c78e2a6b0c36f3.tar.bz2 | |
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.
........
................
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_signal.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 6463f8e..ade339a 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)) |