diff options
| author | Stefan Krah <stefan@bytereef.org> | 2010-05-15 09:31:08 (GMT) |
|---|---|---|
| committer | Stefan Krah <stefan@bytereef.org> | 2010-05-15 09:31:08 (GMT) |
| commit | 7622eba75789badaefed0cbd445883b7a3d7eea2 (patch) | |
| tree | 9249b6475a08c77f0830d451de73d554b7644729 | |
| parent | 2b271f7e3070acbd91b5af7f82140a116ae5dd72 (diff) | |
| download | cpython-7622eba75789badaefed0cbd445883b7a3d7eea2.zip cpython-7622eba75789badaefed0cbd445883b7a3d7eea2.tar.gz cpython-7622eba75789badaefed0cbd445883b7a3d7eea2.tar.bz2 | |
If the timeout is exceeded, count the tests as skipped instead of just
issuing a warning.
| -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 94ee4d1..228a776 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)) |