mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

gh-110918: regrtest: allow to intermix --match and --ignore options (GH-110919)

Browse source 
Test case matching patterns specified by options --match, --ignore,
--matchfile and --ignorefile are now tested in the order of
specification, and the last match determines whether the test case be run
or ignored.
This commit is contained in:
Serhiy Storchaka 2023-10-21 17:44:46 +03:00 • committed by GitHub
parent b578e51f02
commit 9a1fe09622
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 128 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Lib/test/test_regrtest.py
View file

@ -192,34 +192,27 @@ class ParseArgsTestCase(unittest.TestCase):
self.assertTrue(ns.single)
self.checkError([opt, '-f', 'foo'], "don't go together")
def test_ignore(self):
for opt in '-i', '--ignore':
with self.subTest(opt=opt):
ns = self.parse_args([opt, 'pattern'])
self.assertEqual(ns.ignore_tests, ['pattern'])
self.checkError([opt], 'expected one argument')
self.addCleanup(os_helper.unlink, os_helper.TESTFN)
with open(os_helper.TESTFN, "w") as fp:
print('matchfile1', file=fp)
print('matchfile2', file=fp)
filename = os.path.abspath(os_helper.TESTFN)
ns = self.parse_args(['-m', 'match',
'--ignorefile', filename])
self.assertEqual(ns.ignore_tests,
['matchfile1', 'matchfile2'])
def test_match(self):
for opt in '-m', '--match':
with self.subTest(opt=opt):
ns = self.parse_args([opt, 'pattern'])
self.assertEqual(ns.match_tests, ['pattern'])
self.assertEqual(ns.match_tests, [('pattern', True)])
self.checkError([opt], 'expected one argument')
ns = self.parse_args(['-m', 'pattern1',
'-m', 'pattern2'])
self.assertEqual(ns.match_tests, ['pattern1', 'pattern2'])
for opt in '-i', '--ignore':
with self.subTest(opt=opt):
ns = self.parse_args([opt, 'pattern'])
self.assertEqual(ns.match_tests, [('pattern', False)])
self.checkError([opt], 'expected one argument')
ns = self.parse_args(['-m', 'pattern1', '-m', 'pattern2'])
self.assertEqual(ns.match_tests, [('pattern1', True), ('pattern2', True)])
ns = self.parse_args(['-m', 'pattern1', '-i', 'pattern2'])
self.assertEqual(ns.match_tests, [('pattern1', True), ('pattern2', False)])
ns = self.parse_args(['-i', 'pattern1', '-m', 'pattern2'])
self.assertEqual(ns.match_tests, [('pattern1', False), ('pattern2', True)])
self.addCleanup(os_helper.unlink, os_helper.TESTFN)
with open(os_helper.TESTFN, "w") as fp:
@ -227,10 +220,13 @@ class ParseArgsTestCase(unittest.TestCase):
print('matchfile2', file=fp)
filename = os.path.abspath(os_helper.TESTFN)
ns = self.parse_args(['-m', 'match',
'--matchfile', filename])
ns = self.parse_args(['-m', 'match', '--matchfile', filename])
self.assertEqual(ns.match_tests,
['match', 'matchfile1', 'matchfile2'])
[('match', True), ('matchfile1', True), ('matchfile2', True)])
ns = self.parse_args(['-i', 'match', '--ignorefile', filename])
self.assertEqual(ns.match_tests,
[('match', False), ('matchfile1', False), ('matchfile2', False)])
def test_failfast(self):
for opt in '-G', '--failfast':