From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 31 Oct 2009 10:37:15 +0000 (+0000)
Subject: Merged revisions 75986 via svnmerge from
X-Git-Tag: v2.6.5rc1~403
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=265035e1e5e5ea91030dbf3dcbc275f35e397ec1;p=python

Merged revisions 75986 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75986 | mark.dickinson | 2009-10-31 10:36:06 +0000 (Sat, 31 Oct 2009) | 2 lines

  Issue #7042:  Use a better mechanism for testing timers in test_signal.
........
---

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index bd435113d5..9f997be533 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))