Issue #28950: Disallow -j0 combined with -T/-l in regrtest.

This commit is contained in:
Xiang Zhang 2016-12-19 22:00:22 +08:00
commit 772bf2ed83
4 changed files with 7 additions and 2 deletions

View File

@ -301,9 +301,9 @@ def _parse_args(args, **kwargs):
if ns.single and ns.fromfile:
parser.error("-s and -f don't go together!")
if ns.use_mp and ns.trace:
if ns.use_mp is not None and ns.trace:
parser.error("-T and -j don't go together!")
if ns.use_mp and ns.findleaks:
if ns.use_mp is not None and ns.findleaks:
parser.error("-l and -j don't go together!")
if ns.failfast and not (ns.verbose or ns.verbose3):
parser.error("-G/--failfast needs either -v or -W")

0
Lib/test/regrtest.py Normal file → Executable file
View File

View File

@ -226,6 +226,8 @@ class ParseArgsTestCase(unittest.TestCase):
self.checkError([opt, 'foo'], 'invalid int value')
self.checkError([opt, '2', '-T'], "don't go together")
self.checkError([opt, '2', '-l'], "don't go together")
self.checkError([opt, '0', '-T'], "don't go together")
self.checkError([opt, '0', '-l'], "don't go together")
def test_coverage(self):
for opt in '-T', '--coverage':

View File

@ -66,6 +66,9 @@ Windows
Tests
-----
- Issue #28950: Disallow -j0 to be combined with -T/-l in regrtest
command line arguments.
- Issue #28683: Fix the tests that bind() a unix socket and raise
PermissionError on Android for a non-root user.