From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 28 Oct 2009 14:47:15 +0000 (+0000)
Subject: Merged revisions 75525,75530,75922 via svnmerge from
X-Git-Tag: v3.1.2rc1~389
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3438b8ae3f889b148703ae96276c20957ec1277;p=python

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 0c01cd2bea..0ee8bcc7b9 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1227,11 +1227,9 @@ if __name__ == '__main__':
     # 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 f916f4abec..5b4cc5b532 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)