summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-10-28 02:22:08 +0000
committerR. David Murray <rdmurray@bitdance.com>2009-10-28 02:22:08 +0000
commit9e28ca707b225051a59617aaf33997fd688c20cc (patch)
tree4f5da5e86a449ba1fb1784fc5ac862af6daedc93
parent25bdfac9753b0c2660bae6665954219c8bfaa48b (diff)
downloadcpython-git-9e28ca707b225051a59617aaf33997fd688c20cc.tar.gz
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. ........
-rw-r--r--Lib/test/test_support.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 73b6fa2e9c..c9fb092dd3 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)