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

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 5fc4220d1fa7afc67bc1d046d63b3460fed9ce82..4e06a34ca4d4bbae6a3184d0f0993e1aab2e8903 100644 (file)
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -361,6 +361,8 @@ class ItimerTest(unittest.TestCase):
         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
 

diff --git a/Misc/NEWS b/Misc/NEWS
index cb65654cd5b139fdcc3eb1cf6fdc97f9eef33c96..0420a82bd98b46bed8ffd885281230609e5268e8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,11 @@ Extension Modules
 
 - 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
 -----