From: Robert Collins <rbtcollins@hp.com>
Date: Tue, 4 Nov 2014 14:43:36 +0000 (+1300)
Subject: Fix regression in issue 22457 fix.
X-Git-Tag: v3.5.0a1~524
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68b11d129dc28f741e5522fe07b4b935c0d59198;p=thirdparty%2FPython%2Fcpython.git

Fix regression in issue 22457 fix.

When used in the real world it can under some situations trigger
"    assert not _relpath.startswith('..'), "Path must be within the project"
     AssertionError: Path must be within the project
"

Because _get_name_from_path was not expecting to be called with the top level
directory.
---

diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index 8c10ad1f41e6..8ee6c5615312 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -343,6 +343,8 @@ class TestLoader(object):
             return os.path.dirname(full_path)
 
     def _get_name_from_path(self, path):
+        if path == self._top_level_dir:
+            return '.'
         path = _jython_aware_splitext(os.path.normpath(path))
 
         _relpath = os.path.relpath(path, self._top_level_dir)