From 1e9d54c15af1087f6af4beeb37cb2488c8a66270 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 9 Nov 2009 20:10:01 +0000 Subject: [PATCH] Merged revisions 76185 via svnmerge from svn+ssh://pythondev@www.python.org/python/branches/py3k ................ r76185 | mark.dickinson | 2009-11-09 20:08:57 +0000 (Mon, 09 Nov 2009) | 9 lines Merged revisions 76182 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76182 | mark.dickinson | 2009-11-09 19:54:51 +0000 (Mon, 09 Nov 2009) | 1 line Add extra information to a test_signal failure message to aid diagnosis of buildbot failure. ........ ................ --- Lib/test/test_signal.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index c00a77fdb5e..09d0cecf8b2 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -367,7 +367,9 @@ class ItimerTest(unittest.TestCase): if signal.getitimer(self.itimer) == (0.0, 0.0): break # sig_vtalrm handler stopped this itimer else: - self.fail('timeout waiting for sig_vtalrm signal') + self.fail('timeout waiting for sig_vtalrm signal; ' + 'signal.getitimer(self.itimer) gives: %s' % + (signal.getitimer(self.itimer),)) # virtual itimer should be (0.0, 0.0) now self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0))