summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorXiang Zhang <angwerzx@126.com>2016-12-19 14:00:22 (GMT)
committerXiang Zhang <angwerzx@126.com>2016-12-19 14:00:22 (GMT)
commit772bf2ed831671dfd3afd507c2e9babd066d1024 (patch)
treebb52c11b6edc7a12dd6c0b0db08ed2671ac8bcab /Lib/test
parent01e4c1175f4d0c9150f36dae4ca8ec0e6e4ac26b (diff)
parent270a21fda0c41ea120727140ac966a86f694eee4 (diff)
downloadcpython-772bf2ed831671dfd3afd507c2e9babd066d1024.zip
cpython-772bf2ed831671dfd3afd507c2e9babd066d1024.tar.gz
cpython-772bf2ed831671dfd3afd507c2e9babd066d1024.tar.bz2
Issue #28950: Disallow -j0 combined with -T/-l in regrtest.
Diffstat (limited to 'Lib/test')
-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
3 files changed, 4 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':