diff options
| author | Stefan Krah <stefan@bytereef.org> | 2010-04-20 08:07:08 (GMT) |
|---|---|---|
| committer | Stefan Krah <stefan@bytereef.org> | 2010-04-20 08:07:08 (GMT) |
| commit | 488fea3cca18f62be958d6df9d9ca3a606072cf9 (patch) | |
| tree | b7a7429fd6da6d87e429f4fe3701ee20528238d5 /Lib | |
| parent | c00deec386dcf11ff2b35b51dd7e8ad87ab00d1b (diff) | |
| download | cpython-488fea3cca18f62be958d6df9d9ca3a606072cf9.zip cpython-488fea3cca18f62be958d6df9d9ca3a606072cf9.tar.gz cpython-488fea3cca18f62be958d6df9d9ca3a606072cf9.tar.bz2 | |
Merged revisions 80238 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80238 | stefan.krah | 2010-04-20 09:59:10 +0200 (Tue, 20 Apr 2010) | 9 lines
1) The timeout in the itimer tests was too low for slow or heavily
loaded machines.
2) Even with the increased timeout, the OS does not guarantee that
a process will get a certain amount of virtual time in 60s, so
the failure is changed to a diagnostic.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_signal.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 5945bf9..9bc9f8c 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -361,15 +361,15 @@ class ItimerTest(unittest.TestCase): signal.setitimer(self.itimer, 0.3, 0.2) start_time = time.time() - while time.time() - start_time < 5.0: + while time.time() - start_time < 60.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; ' - 'signal.getitimer(self.itimer) gives: %s' % - (signal.getitimer(self.itimer),)) + else: # Issue 8424 + sys.stdout.write("test_itimer_virtual: timeout: likely cause: " + "machine too slow or load too high.\n") + return # virtual itimer should be (0.0, 0.0) now self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0)) @@ -382,13 +382,15 @@ class ItimerTest(unittest.TestCase): signal.setitimer(self.itimer, 0.2, 0.2) start_time = time.time() - while time.time() - start_time < 5.0: + while time.time() - start_time < 60.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') + else: # Issue 8424 + sys.stdout.write("test_itimer_prof: timeout: likely cause: " + "machine too slow or load too high.\n") + return # profiling itimer should be (0.0, 0.0) now self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0)) |