Commit 48e81006 authored by Gregory P. Smith's avatar Gregory P. Smith

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.
parent 56664613
...@@ -426,11 +426,13 @@ class CmdLineTest(unittest.TestCase): ...@@ -426,11 +426,13 @@ class CmdLineTest(unittest.TestCase):
self.assertIn(b'Unknown option: -z', err) self.assertIn(b'Unknown option: -z', err)
self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1) self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
self.assertEqual(b'', out) 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.assertIn(b'Unknown option: -z', err)
self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1) self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
self.assertEqual(b'', out) 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) self.assertIn(b'Unknown option: -a', err)
# only the first unknown option is reported # only the first unknown option is reported
self.assertNotIn(b'Unknown option: -z', err) self.assertNotIn(b'Unknown option: -z', err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment