#16306: report only the first unknown option and add more tests. Patch by Serhiy Storchaka.
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index d8f2443..e12f305 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -376,12 +376,24 @@
print("del sys.modules['__main__']", file=script)
assert_python_ok(filename)
-
def test_unknown_options(self):
- rc, out, err = assert_python_failure('-z', __cleanenv=True)
- self.assertIn(b'Unknown option', err)
+ rc, out, err = assert_python_failure('-E', '-z')
+ self.assertIn(b'Unknown option: -z', err)
self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
self.assertEqual(b'', out)
+ # Add "without='-E'" to prevent _assert_python to append -E
+ # to env_vars and change the output of stderr
+ rc, out, err = assert_python_failure('-z', without='-E')
+ self.assertIn(b'Unknown option: -z', err)
+ self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+ self.assertEqual(b'', out)
+ rc, out, err = assert_python_failure('-a', '-z', without='-E')
+ self.assertIn(b'Unknown option: -a', err)
+ # only the first unknown option is reported
+ self.assertNotIn(b'Unknown option: -z', err)
+ self.assertEqual(err.splitlines().count(b'Unknown option: -a'), 1)
+ self.assertEqual(b'', out)
+
def test_main():
test.support.run_unittest(CmdLineTest)