Skip to content

Commit

Permalink
bpo-30523: regrtest --list-cases --match (#2401)
Browse files Browse the repository at this point in the history
* regrtest --list-cases now supports --match and --match-file options.
  Example: ./python -m test --list-cases -m FileTests test_os
* --list-cases now also sets support.verbose to False to prevent
  messages to stdout when loading test modules.
* Add support._match_test() private function.
  • Loading branch information
vstinner committed Jun 26, 2017
1 parent 8c78aa7 commit ace56d5
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 15 deletions.
6 changes: 5 additions & 1 deletion Lib/test/libregrtest/main.py
Expand Up @@ -256,9 +256,13 @@ def _list_cases(self, suite):
if isinstance(test, unittest.TestSuite):
self._list_cases(test)
elif isinstance(test, unittest.TestCase):
print(test.id())
if support._match_test(test):
print(test.id())

def list_cases(self):
support.verbose = False
support.match_tests = self.ns.match_tests

for test in self.selected:
abstest = get_abs_module(self.ns, test)
try:
Expand Down
32 changes: 18 additions & 14 deletions Lib/test/support/__init__.py
Expand Up @@ -1905,6 +1905,23 @@ def _run_suite(suite):
raise TestFailed(err)


def _match_test(test):
global match_tests

if match_tests is None:
return True
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


def run_unittest(*classes):
"""Run tests from unittest.TestCase-derived classes."""
valid_types = (unittest.TestSuite, unittest.TestCase)
Expand All @@ -1919,20 +1936,7 @@ def run_unittest(*classes):
suite.addTest(cls)
else:
suite.addTest(unittest.makeSuite(cls))
def case_pred(test):
if match_tests is None:
return True
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
_filter_suite(suite, case_pred)
_filter_suite(suite, _match_test)
_run_suite(suite)

#=======================================================================
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_regrtest.py
Expand Up @@ -837,11 +837,20 @@ def test_method2(self):
pass
""")
testname = self.create_test(code=code)

# Test --list-cases
all_methods = ['%s.Tests.test_method1' % testname,
'%s.Tests.test_method2' % testname]
output = self.run_tests('--list-cases', testname)
self.assertEqual(output.splitlines(), all_methods)

# Test --list-cases with --match
all_methods = ['%s.Tests.test_method1' % testname]
output = self.run_tests('--list-cases',
'-m', 'test_method1',
testname)
self.assertEqual(output.splitlines(), all_methods)

def test_crashed(self):
# Any code which causes a crash
code = 'import faulthandler; faulthandler._sigsegv()'
Expand Down

0 comments on commit ace56d5

Please sign in to comment.