Skip to content

bpo-32419 Add unittest support for pyc projects, skip news #4998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brgirgis wants to merge 2 commits into from
Closed

bpo-32419 Add unittest support for pyc projects, skip news #4998

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31dd8a8
Merge pull request #1 from python/master
brgirgis Dec 23, 2017
6887092
Enable unittest for pyc based projects
brgirgis Dec 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Lib/unittest/loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def discover(self, start_dir, pattern='test*.py', top_level_dir=None):
If the start directory is not the top level directory then the top
level directory must be specified separately.

If a test package name (directory with '__init__.py') matches the
If a test package name (directory with '__init__.py' or '__init__.pyc') matches the
pattern then the package will be checked for a 'load_tests' function. If
this exists then it will be called with (loader, tests, pattern) unless
the package has already had load_tests called from the same discovery
Expand Down Expand Up @@ -289,7 +289,9 @@ def discover(self, start_dir, pattern='test*.py', top_level_dir=None):
if os.path.isdir(os.path.abspath(start_dir)):
start_dir = os.path.abspath(start_dir)
if start_dir != top_level_dir:
is_not_importable = not os.path.isfile(os.path.join(start_dir, '__init__.py'))
is_not_importable = not any([
os.path.isfile(os.path.join(start_dir, '__init__.py')),
os.path.isfile(os.path.join(start_dir, '__init__.pyc'))])
else:
# support for discovery from dotted module names
try:
Expand Down Expand Up @@ -351,7 +353,8 @@ 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'):
if any([os.path.basename(full_path).lower().startswith('__init__.py'),
os.path.basename(full_path).lower().startswith('__init__.pyc')]):
return os.path.dirname(os.path.dirname(full_path))
else:
# here we have been given a module rather than a package - so
Expand Down Expand Up @@ -416,8 +419,8 @@ def _find_tests(self, start_dir, pattern, namespace=False):
def _find_test_path(self, full_path, pattern, namespace=False):
"""Used by discovery.

Loads tests from a single file, or a directories' __init__.py when
passed the directory.
Loads tests from a single file, or a directories' __init__.py
(or __init__.pyc) when passed the directory.

Returns a tuple (None_or_tests_from_file, should_recurse).
"""
Expand Down Expand Up @@ -458,7 +461,8 @@ def _find_test_path(self, full_path, pattern, namespace=False):
return self.loadTestsFromModule(module, pattern=pattern), False
elif os.path.isdir(full_path):
if (not namespace and
not os.path.isfile(os.path.join(full_path, '__init__.py'))):
not os.path.isfile(os.path.join(full_path, '__init__.py')) and
not os.path.isfile(os.path.join(full_path, '__init__.pyc'))):
return None, False

load_tests = None
Expand Down