diff options
| -rw-r--r-- | Lib/test/libregrtest/cmdline.py | 11 | ||||
| -rw-r--r-- | Lib/test/test_regrtest.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 5 |
3 files changed, 21 insertions, 4 deletions
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py index c9e2f3d060..891b00c753 100644 --- a/Lib/test/libregrtest/cmdline.py +++ b/Lib/test/libregrtest/cmdline.py @@ -242,9 +242,6 @@ def _create_parser(): group.add_argument('-P', '--pgo', dest='pgo', action='store_true', help='enable Profile Guided Optimization training') - parser.add_argument('args', nargs='*', - help=argparse.SUPPRESS) - return parser @@ -294,7 +291,13 @@ def _parse_args(args, **kwargs): ns.use_resources = [] parser = _create_parser() - parser.parse_args(args=args, namespace=ns) + # Issue #14191: argparse doesn't support "intermixed" positional and + # optional arguments. Use parse_known_args() as workaround. + ns.args = parser.parse_known_args(args=args, namespace=ns)[1] + for arg in ns.args: + if arg.startswith('-'): + parser.error("unrecognized arguments: %s" % arg) + sys.exit(1) if ns.single and ns.fromfile: parser.error("-s and -f don't go together!") diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 5de2a6f12e..d43160470f 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -299,6 +299,15 @@ class ParseArgsTestCase(unittest.TestCase): self.assertEqual(ns.verbose, 0) self.assertEqual(ns.args, ['foo']) + def test_arg_option_arg(self): + ns = libregrtest._parse_args(['test_unaryop', '-v', 'test_binop']) + self.assertEqual(ns.verbose, 1) + self.assertEqual(ns.args, ['test_unaryop', 'test_binop']) + + def test_unknown_option(self): + self.checkError(['--unknown-option'], + 'unrecognized arguments: --unknown-option') + class BaseTestCase(unittest.TestCase): TEST_UNIQUE_ID = 1 @@ -25,6 +25,11 @@ Build - Issue #28248: Update Windows build to use OpenSSL 1.0.2j. +Tests +----- + +- Issue #28409: regrtest: fix the parser of command line arguments. + What's New in Python 3.6.0 beta 2 ================================= |