From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 19 Oct 2009 18:06:17 +0000 (+0000)
Subject: Merged revisions 75528 via svnmerge from
X-Git-Tag: v3.2a1~2368
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=723357e0145f31505f9d35effc28803c06404829;p=python

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/support.py b/Lib/test/support.py
index 611d48fe9b..0f3e2ee9b6 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -889,7 +889,8 @@ 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)