From 48e810069ddc725903588c9609ac84900ee65b4c Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Thu, 22 Jan 2015 22:55:00 -0800 Subject: [PATCH] revert 7b833bd1f509. I misread the side effect that the code was triggering. *any* kwarg supplied to _assert_python causes it to not append -E to the command line flags so without='-E' does effectively work. --- Lib/test/test_cmd_line.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index c862b2078be..327c1455fcf 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -426,11 +426,13 @@ class CmdLineTest(unittest.TestCase): 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('-z') + # 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') + 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)