mirror of
https://github.com/python/cpython.git
synced 2024-12-19 23:04:14 +08:00
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. ........ ................
This commit is contained in:
parent
1f7122d426
commit
174ba00050
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user