summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-11-09 20:08:57 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-11-09 20:08:57 (GMT)
commit28cee96ee1106aa5597f7b51be1a8ba0d2bdfcb2 (patch)
tree66e2d3fff23eb50cc7e8d37fb1560e7ab9f8d81e /Lib
parentad731b9af9bf8095755b6420b53f9d20d630dfdf (diff)
downloadcpython-28cee96ee1106aa5597f7b51be1a8ba0d2bdfcb2.zip
cpython-28cee96ee1106aa5597f7b51be1a8ba0d2bdfcb2.tar.gz
cpython-28cee96ee1106aa5597f7b51be1a8ba0d2bdfcb2.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_signal.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index c00a77f..09d0cec 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))