[Python-checkins] r75986 - python/trunk/Lib/test/test_signal.py

[mark.dickinson]

Author: mark.dickinson
Date: Sat Oct 31 11:36:06 2009
New Revision: 75986

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


Modified:
   python/trunk/Lib/test/test_signal.py

Modified: python/trunk/Lib/test/test_signal.py
==============================================================================
--- python/trunk/Lib/test/test_signal.py	(original)
+++ python/trunk/Lib/test/test_signal.py	Sat Oct 31 11:36:06 2009
@@ -360,11 +360,14 @@
         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 @@
         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))