summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-10-04 18:38:39 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-10-04 18:38:39 (GMT)
commit245d915e3ecba012b3d42d750460997e3e0a95d4 (patch)
tree1e51e860788da98580d95948b193e184d86eb851
parent82d31e9b20274ee6adf498ee583a3c3825a115ac (diff)
downloadcpython-245d915e3ecba012b3d42d750460997e3e0a95d4.zip
cpython-245d915e3ecba012b3d42d750460997e3e0a95d4.tar.gz
cpython-245d915e3ecba012b3d42d750460997e3e0a95d4.tar.bz2
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.
-rw-r--r--Lib/test/test_signal.py2
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 4368375..df0828d 100644
--- 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 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
diff --git a/Misc/NEWS b/Misc/NEWS
index bafb0ab..2e052fa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1436,6 +1436,8 @@ Extension Modules
Tests
-----
+- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6.
+
- Issue #6806: test_platform failed under OS X 10.6.0 because ``sw_ver`` leaves
off the trailing 0 in the version number.