From 2e30440153dbd7864fa2201a43a48ebfec66b14b Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 4 Oct 2009 18:43:54 +0000 Subject: [PATCH] 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 | 2 ++ Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 5fc4220d1fa..4e06a34ca4d 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 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 9b8c820439f..e673d619b99 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -252,6 +252,8 @@ Documentation Tests ----- +- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. + - Fixed tests in importlib.test.source.test_abc_loader that were masking the proper exceptions that should be raised for missing or improper code object bytecode.