summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2015-01-23 06:05:00 (GMT)
committerGregory P. Smith <greg@krypto.org>2015-01-23 06:05:00 (GMT)
commitd16478095c18f883cef7d34482a2e27b5b8a87f2 (patch)
tree06a7ecedc02794cc6ad1226af0d1ad6a65f6f300 /Lib/test
parent058fb7a884cf8b97174a566efb2f0ff82495bca5 (diff)
parent566646133e2f7dec4f3a3139a4317eb252629aff (diff)
downloadcpython-d16478095c18f883cef7d34482a2e27b5b8a87f2.zip
cpython-d16478095c18f883cef7d34482a2e27b5b8a87f2.tar.gz
cpython-d16478095c18f883cef7d34482a2e27b5b8a87f2.tar.bz2
Remove the unimplemented but ignored without='-E' parameters being passed to
script_helper.assert_python_failure(). No such feature has ever existed, thus it doesn't do what the comment claims. (It does add a 'without' variable to the environment of the child process but that was not intended)
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_cmd_line.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 327c145..c862b20 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -426,13 +426,11 @@ 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)
- # 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')
+ rc, out, err = assert_python_failure('-z')
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')
+ rc, out, err = assert_python_failure('-a', '-z')
self.assertIn(b'Unknown option: -a', err)
# only the first unknown option is reported
self.assertNotIn(b'Unknown option: -z', err)