diff options
| author | Gregory P. Smith <greg@krypto.org> | 2015-01-23 06:55:00 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2015-01-23 06:55:00 (GMT) |
| commit | 48e810069ddc725903588c9609ac84900ee65b4c (patch) | |
| tree | 8a3e4936b5837509e538fe2d1a0b6a2760c54159 /Lib | |
| parent | 566646133e2f7dec4f3a3139a4317eb252629aff (diff) | |
| download | cpython-48e810069ddc725903588c9609ac84900ee65b4c.zip cpython-48e810069ddc725903588c9609ac84900ee65b4c.tar.gz cpython-48e810069ddc725903588c9609ac84900ee65b4c.tar.bz2 | |
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.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_cmd_line.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index c862b20..327c145 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) |