Skip to content

bpo-31324: Optimize support._match_test(). #4420

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
serhiy-storchaka wants to merge 2 commits into from
Closed

bpo-31324: Optimize support._match_test(). #4420

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f49a44
bpo-31324: Optimize support._match_test().
serhiy-storchaka Nov 16, 2017
75990b1
No re.I flag.
serhiy-storchaka Nov 16, 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
21 changes: 11 additions & 10 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,21 +1900,22 @@ def _run_suite(suite):
raise TestFailed(err)


_match_tests = None
_match_test1 = None

def _match_test(test):
global match_tests
global _match_tests, _match_test1

if match_tests is None:
return True
if match_tests != _match_tests:
match_tests_re = '|'.join(map(fnmatch.translate, match_tests))
_match_test1 = re.compile(match_tests_re).match
_match_tests = match_tests[:]
test_id = test.id()

for match_test in match_tests:
if fnmatch.fnmatchcase(test_id, match_test):
return True

for name in test_id.split("."):
if fnmatch.fnmatchcase(name, match_test):
return True
return False
if _match_test1(test_id):
return True
return any(map(_match_test1, test_id.split(".")))

@vstinner vstinner Nov 16, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If all match_tests patterns contain a dot ".", we could make this code even simpler:

return match_test(test_id)

But I'm unable to see a major performance difference when running:

./python -m test.bisect --fail-env-changed -o bisect test_asyncio -v

I'm checking how much time it takes before running the first test: so the time to load and filter tests.



def run_unittest(*classes):
Expand Down