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.
........
................
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 0c01cd2..0ee8bcc 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1227,11 +1227,9 @@
# much of the testing framework relies on the globals in the
# test.support module.
mydir = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
- i = pathlen = len(sys.path)
+ i = len(sys.path)
while i >= 0:
i -= 1
if os.path.abspath(os.path.normpath(sys.path[i])) == mydir:
del sys.path[i]
- if len(sys.path) == pathlen:
- print('Could not find %r in sys.path to remove it' % mydir)
main()
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 @@
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)