summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/libregrtest/cmdline.py4
-rwxr-xr-x[-rw-r--r--]Lib/test/regrtest.py0
-rw-r--r--Lib/test/test_regrtest.py2
-rw-r--r--Misc/NEWS3
4 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
index 891b00c..d621f5f 100644
--- a/Lib/test/libregrtest/cmdline.py
+++ b/Lib/test/libregrtest/cmdline.py
@@ -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")
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 21b0edf..21b0edf 100644..100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 52909d8..751df15 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -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':
diff --git a/Misc/NEWS b/Misc/NEWS
index 5bf0f32..1aa0a75 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -627,6 +627,9 @@ Tools/Demos
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.