If the timeout is exceeded, count the tests as skipped instead of just

issuing a warning.

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 94ee4d129c3437be46426ce9b1e892a1d29bdbfa..228a776de5d41955813787868dea3994df5591ca 100644 (file)
--- 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))