diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-31 10:36:06 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-31 10:36:06 (GMT) |
| commit | 4b841d9156208d672a3848abb2798555552862d7 (patch) | |
| tree | 79bcb3768f2a4df52e474ae861bc45c60e6d2057 | |
| parent | 504a151c825a28e85f81a94c8acbe6b865d66912 (diff) | |
| download | cpython-4b841d9156208d672a3848abb2798555552862d7.zip cpython-4b841d9156208d672a3848abb2798555552862d7.tar.gz cpython-4b841d9156208d672a3848abb2798555552862d7.tar.bz2 | |
Issue #7042: Use a better mechanism for testing timers in test_signal.
| -rw-r--r-- | Lib/test/test_signal.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index df0828d..c4b8e4e 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -360,11 +360,14 @@ class ItimerTest(unittest.TestCase): signal.signal(signal.SIGVTALRM, self.sig_vtalrm) signal.setitimer(self.itimer, 0.3, 0.2) - for i in xrange(100000000): + start_time = time.time() + while time.time() - start_time < 5.0: # use up some virtual time by doing real work _ = pow(12345, 67890, 10000019) if signal.getitimer(self.itimer) == (0.0, 0.0): break # sig_vtalrm handler stopped this itimer + else: + self.fail('timeout waiting for sig_vtalrm signal') # virtual itimer should be (0.0, 0.0) now self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0)) @@ -376,9 +379,14 @@ class ItimerTest(unittest.TestCase): signal.signal(signal.SIGPROF, self.sig_prof) signal.setitimer(self.itimer, 0.2, 0.2) - for i in xrange(100000000): + start_time = time.time() + while time.time() - start_time < 5.0: + # do some work + _ = pow(12345, 67890, 10000019) if signal.getitimer(self.itimer) == (0.0, 0.0): break # sig_prof handler stopped this itimer + else: + self.fail('timeout waiting for sig_prof signal') # profiling itimer should be (0.0, 0.0) now self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0)) |