[Python-checkins] r81189 - in python/branches/release31-maint: Lib/test/test_signal.py

Sat May 15 11:45:07 CEST 2010

Author: stefan.krah
Date: Sat May 15 11:45:07 2010
New Revision: 81189
Log:
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 (2010年5月15日) | 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 (2010年5月15日) | 4 lines
 
 If the timeout is exceeded, count the tests as skipped instead of just
 issuing a warning.
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/test/test_signal.py
Modified: python/branches/release31-maint/Lib/test/test_signal.py
==============================================================================

--- python/branches/release31-maint/Lib/test/test_signal.py	(original)
+++ python/branches/release31-maint/Lib/test/test_signal.py	Sat May 15 11:45:07 2010
@@ -431,9 +431,8 @@
 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 @@
 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))
