changeset:   105752:3b4d00e20694
parent:      105748:3ab0a6692e25
parent:      105751:692834062e80
user:        Xiang Zhang <angwerzx@126.com>
date:        Mon Dec 19 22:05:46 2016 +0800
files:       Lib/test/regrtest.py Misc/NEWS
description:
Issue #28950: Merge 3.6.


diff -r 3ab0a6692e25 -r 3b4d00e20694 Lib/test/libregrtest/cmdline.py
--- a/Lib/test/libregrtest/cmdline.py	Mon Dec 19 13:12:08 2016 +0100
+++ b/Lib/test/libregrtest/cmdline.py	Mon Dec 19 22:05:46 2016 +0800
@@ -301,9 +301,9 @@
 
     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 -r 3ab0a6692e25 -r 3b4d00e20694 Lib/test/test_regrtest.py
--- a/Lib/test/test_regrtest.py	Mon Dec 19 13:12:08 2016 +0100
+++ b/Lib/test/test_regrtest.py	Mon Dec 19 22:05:46 2016 +0800
@@ -226,6 +226,8 @@
                 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 -r 3ab0a6692e25 -r 3b4d00e20694 Misc/NEWS
--- a/Misc/NEWS	Mon Dec 19 13:12:08 2016 +0100
+++ b/Misc/NEWS	Mon Dec 19 22:05:46 2016 +0800
@@ -627,6 +627,9 @@
 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.