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

[mark.dickinson]

Author: mark.dickinson
Date: Sun Oct  4 20:47:48 2009
New Revision: 75239

Log:
Merged revisions 75238 via svnmerge from 
svn+ssh://pythondev@www.python.org/python/branches/py3k

................
  r75238 | mark.dickinson | 2009-10-04 19:43:54 +0100 (Sun, 04 Oct 2009) | 11 lines
  
  Merged revisions 75236 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r75236 | mark.dickinson | 2009-10-04 19:38:39 +0100 (Sun, 04 Oct 2009) | 4 lines
    
    Issue #7042:  Fix test_signal failure on OS X 10.6 64-bit builds
    (and also, with luck, on the x86 FreeBSD buildbot), by making sure
    that some user time is used in test_itimer_virtual.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_signal.py
   python/branches/release31-maint/Misc/NEWS

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	Sun Oct  4 20:47:48 2009
@@ -361,6 +361,8 @@
         signal.setitimer(self.itimer, 0.3, 0.2)
 
         for i in range(100000000):
+            # 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
 

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Oct  4 20:47:48 2009
@@ -73,6 +73,11 @@
 
 - Issue #6848: Fix curses module build failure on OS X 10.6.
 
+Tests
+-----
+
+- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6.
+
 Build
 -----