[Python-checkins] r76186 - in python/branches/release31-maint: Lib/test/test_signal.py

[mark.dickinson]

Author: mark.dickinson
Date: Mon Nov  9 21:10:01 2009
New Revision: 76186

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_signal.py

Modified: python/branches/release31-maint/Lib/test/test_signal.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_signal.py	(original)
+++ python/branches/release31-maint/Lib/test/test_signal.py	Mon Nov  9 21:10:01 2009
@@ -367,7 +367,9 @@
             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))