From 68b11d129dc28f741e5522fe07b4b935c0d59198 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Wed, 5 Nov 2014 03:43:36 +1300 Subject: 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. --- Lib/unittest/loader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py index 8c10ad1..8ee6c56 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) -- cgit v0.12