[Python-checkins] r75900 - in python/branches/release26-maint: Lib/test/test_support.py

[r.david.murray]

Author: r.david.murray
Date: Wed Oct 28 03:22:08 2009
New Revision: 75900

Log:
Merged revisions 75528 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75528 | r.david.murray | 2009-10-19 13:53:58 -0400 (Mon, 19 Oct 2009) | 4 lines
  
  Clarify error report message, and don't recommend running in verbose
  mode for more information if we are already running in verbose mode.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_support.py

Modified: python/branches/release26-maint/Lib/test/test_support.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_support.py	(original)
+++ python/branches/release26-maint/Lib/test/test_support.py	Wed Oct 28 03:22:08 2009
@@ -703,7 +703,9 @@
         elif len(result.failures) == 1 and not result.errors:
             err = result.failures[0][1]
         else:
-            err = "errors occurred; run in verbose mode for details"
+            err = "multiple errors occurred"
+            if not verbose:
+                err += "; run in verbose mode for details"
         raise TestFailed(err)