From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 28 Oct 2009 02:22:08 +0000 (+0000)
Subject: Merged revisions 75528 via svnmerge from
X-Git-Tag: v2.6.5rc1~418
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e28ca707b225051a59617aaf33997fd688c20cc;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 73b6fa2e9c2e..c9fb092dd3a5 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -703,7 +703,9 @@ def _run_suite(suite):
         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)