mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix module directory finding logic for dotted paths in unittest test discovery.

Browse source
This commit is contained in:
Michael Foord 2010-04-06 23:18:16 +00:00
parent ccd8bc8a83
commit c1bf677e28
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/unittest/loader.py
View file

@ -192,7 +192,7 @@ class TestLoader(object):
top_part = start_dir.split('.')[0] top_part = start_dir.split('.')[0]
start_dir = os.path.abspath(os.path.dirname((the_module.__file__))) start_dir = os.path.abspath(os.path.dirname((the_module.__file__)))
if set_implicit_top: if set_implicit_top:
self._top_level_dir = os.path.abspath(os.path.dirname(os.path.dirname(sys.modules[top_part].__file__))) self._top_level_dir = self._get_directory_containing_module(top_part)
sys.path.remove(top_level_dir) sys.path.remove(top_level_dir)
if is_not_importable: if is_not_importable:
@ -201,6 +201,18 @@ class TestLoader(object):
tests = list(self._find_tests(start_dir, pattern)) tests = list(self._find_tests(start_dir, pattern))
return self.suiteClass(tests) return self.suiteClass(tests)
def _get_directory_containing_module(self, module_name):
module = sys.modules[module_name]
full_path = os.path.abspath(module.__file__)
if os.path.basename(full_path).lower().startswith('__init__.py'):
return os.path.dirname(os.path.dirname(full_path))
else:
# here we have been given a module rather than a package - so
# all we can do is search the *same* directory the module is in
# should an exception be raised instead
return os.path.dirname(full_path)
def _get_name_from_path(self, path): def _get_name_from_path(self, path):
path = os.path.splitext(os.path.normpath(path))[0] path = os.path.splitext(os.path.normpath(path))[0]