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.
........

Lib/test/test_signal.py

@@ -361,6 +361,8 @@ class ItimerTest(unittest.TestCase):
         signal.setitimer(self.itimer, 0.3, 0.2)
 
         for i in xrange(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
 

Misc/NEWS

@@ -23,6 +23,11 @@ Library
 - Issue #7039: Fixed distutils.tests.test_sysconfig when running on
   installation with no build.
 
+Tests
+-----
+
+- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6.
+
 
 What's New in Python 2.6.3
 ==========================