Skip to content

bpo-37957: Allow regrtest to receive a file with test (and subtests) to ignore #16989

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

Merged
pablogsal merged 7 commits into from
Nov 19, 2019
Merged

bpo-37957: Allow regrtest to receive a file with test (and subtests) to ignore #16989

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd5ba6e
bpo-37957: Allow regrtest to receive a file with test (and subtests) …
pablogsal Oct 29, 2019
720ba4a
Update Lib/test/support/__init__.py
pablogsal Nov 19, 2019
f0c1da4
Update Lib/test/support/__init__.py
pablogsal Nov 19, 2019
16cec07
fixup! Update Lib/test/support/__init__.py
pablogsal Nov 19, 2019
da9763c
fixup! fixup! Update Lib/test/support/__init__.py
pablogsal Nov 19, 2019
e9ee42f
fixup! fixup! fixup! Update Lib/test/support/__init__.py
pablogsal Nov 19, 2019
6a27c69
fixup! fixup! fixup! fixup! Update Lib/test/support/__init__.py
pablogsal Nov 19, 2019
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
Prev Previous commit
Next Next commit
fixup! Update Lib/test/support/__init__.py
  • Loading branch information
@pablogsal
pablogsal committed Nov 19, 2019
commit 16cec07102c9fa01cdb5c4545ca06844773b11e2
32 changes: 16 additions & 16 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2067,45 +2067,45 @@ def _is_full_match_test(pattern):
# as a full test identifier.
# Example: 'test.test_os.FileTests.test_access'.
#
# Reject patterns which contain fnmatch patterns: '*', '?', '[...]'
# or '[!...]'. For example, reject 'test_access*'.
# ignore patterns which contain fnmatch patterns: '*', '?', '[...]'
# or '[!...]'. For example, ignore 'test_access*'.
return ('.' in pattern) and (not re.search(r'[?*\[\]]', pattern))


def set_match_tests(accept_patterns=None, reject_patterns=None):
def set_match_tests(accept_patterns=None, ignore_patterns=None):
global _match_test_func, _accept_test_patterns, _ignore_test_patterns


if accept_patterns is None:
accept_patterns = ()
if reject_patterns is None:
reject_patterns = ()
if ignore_patterns is None:
ignore_patterns = ()

accept_func = reject_func = None
accept_func = ignore_func = None

if accept_patterns != _accept_test_patterns:
accept_patterns, accept_func = _update_match_function(accept_patterns)
if reject_patterns != _ignore_test_patterns:
reject_patterns, reject_func = _update_match_function(reject_patterns)
accept_patterns, accept_func = _compile_match_function(accept_patterns)
if ignore_patterns != _ignore_test_patterns:
ignore_patterns, ignore_func = _compile_match_function(ignore_patterns)

# Create a copy since patterns can be mutable and so modified later
_accept_test_patterns = tuple(accept_patterns)
_ignore_test_patterns = tuple(reject_patterns)
_ignore_test_patterns = tuple(ignore_patterns)

if accept_func is not None or reject_func is not None:
if accept_func is not None or ignore_func is not None:
def match_function(test_id):
accept = True
reject = False
ignore = False
if accept_func:
accept = accept_func(test_id)
if reject_func:
reject = reject_func(test_id)
return accept and not reject
if ignore_func:
ignore = ignore_func(test_id)
return accept and not ignore

_match_test_func = match_function


def _update_match_function(patterns):
def _compile_match_function(patterns):
if not patterns:
func = None
# set_match_tests(None) behaves as set_match_tests(())
Expand Down