diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-11-09 20:10:01 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-11-09 20:10:01 (GMT) |
| commit | 1e9d54c15af1087f6af4beeb37cb2488c8a66270 (patch) | |
| tree | 56e648053cc34ecc5a78d36ec86ee8dc5fe72e27 | |
| parent | 94882db60fa09f2a2714cfd93ec1a53385b7b271 (diff) | |
| download | cpython-1e9d54c15af1087f6af4beeb37cb2488c8a66270.zip cpython-1e9d54c15af1087f6af4beeb37cb2488c8a66270.tar.gz cpython-1e9d54c15af1087f6af4beeb37cb2488c8a66270.tar.bz2 | |
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.
........
................
| -rw-r--r-- | Lib/test/test_signal.py | 4 |
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)) |