diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-10-28 14:47:15 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-10-28 14:47:15 (GMT) |
| commit | b3438b8ae3f889b148703ae96276c20957ec1277 (patch) | |
| tree | 6a23f8b0f97c9554003155429a68e4cb6f83ef95 /Lib/test/support.py | |
| parent | b4bddf510c3b88e7ac67428bc67960ac449f83cf (diff) | |
| download | cpython-b3438b8ae3f889b148703ae96276c20957ec1277.zip cpython-b3438b8ae3f889b148703ae96276c20957ec1277.tar.gz cpython-b3438b8ae3f889b148703ae96276c20957ec1277.tar.bz2 | |
Merged revisions 75525,75530,75922 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75525 | r.david.murray | 2009-10-19 12:33:43 -0400 (Mon, 19 Oct 2009) | 12 lines
Merged revisions 75524 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75524 | r.david.murray | 2009-10-19 12:28:24 -0400 (Mon, 19 Oct 2009) | 6 lines
Eliminate warning message that looks like an error message. When it was
added not finding Lib/test in the path indicated something was wrong,
but when running regtest using "python -m" Lib/test isn't typically in
the path, so this message is now more disturbing than it is helpful.
........
................
r75530 | r.david.murray | 2009-10-19 14:06:17 -0400 (Mon, 19 Oct 2009) | 10 lines
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.
........
................
r75922 | r.david.murray | 2009-10-28 10:07:51 -0400 (Wed, 28 Oct 2009) | 9 lines
Merged revisions 75920 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75920 | r.david.murray | 2009-10-28 10:03:43 -0400 (Wed, 28 Oct 2009) | 2 lines
Remove variable that is no longer used.
........
................
Diffstat (limited to 'Lib/test/support.py')
| -rw-r--r-- | Lib/test/support.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index f916f4a..5b4cc5b 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -857,7 +857,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) |