diff options
| author | R David Murray <rdmurray@bitdance.com> | 2015-04-14 17:58:40 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2015-04-14 17:58:40 -0400 |
| commit | 51fb72c0b06b28f708e80a004bcc3e7fa5c450e4 (patch) | |
| tree | d70b60f16980df1f83b48636d244aca773f59603 /Lib/test/test_cmd_line.py | |
| parent | e8611ed72e0c09590fd108c37847427e07b7a214 (diff) | |
| parent | 7b9d9d0a2ea2934bf81c62ea53da2558cfabdc80 (diff) | |
| download | cpython-51fb72c0b06b28f708e80a004bcc3e7fa5c450e4.tar.gz | |
Merge: #23925: stop (eg) PYTHONSTARTUP from causing test_cmd_line failure.
Diffstat (limited to 'Lib/test/test_cmd_line.py')
| -rw-r--r-- | Lib/test/test_cmd_line.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index cb9bbddc8c..6ba929c346 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -344,7 +344,8 @@ class CmdLineTest(unittest.TestCase): # Issue #5319: if stdout.flush() fails at shutdown, an error should # be printed out. code = """if 1: - import os, sys + import os, sys, test.support + test.support.SuppressCrashReport().__enter__() sys.stdout.write('x') os.close(sys.stdout.fileno())""" rc, out, err = assert_python_ok('-c', code) @@ -444,7 +445,7 @@ class CmdLineTest(unittest.TestCase): self.assertEqual(err.splitlines().count(b'Unknown option: -a'), 1) self.assertEqual(b'', out) - @unittest.skipIf(script_helper._interpreter_requires_environment(), + @unittest.skipIf(script_helper.interpreter_requires_environment(), 'Cannot run -I tests when PYTHON env vars are required.') def test_isolatedmode(self): self.verify_valid_flag('-I') |