mirror of
https://github.com/python/cpython.git
synced 2024-11-21 12:59:38 +01:00
gh-112730: Respect tests that require environment variables with no-colorize fixes (#118288)
This commit is contained in:
parent
5a90de0d4c
commit
b43c7e1070
@ -384,6 +384,7 @@ class TracebackCases(unittest.TestCase):
|
||||
])
|
||||
|
||||
@requires_subprocess()
|
||||
@force_not_colorized
|
||||
def test_encoded_file(self):
|
||||
# Test that tracebacks are correctly printed for encoded source files:
|
||||
# - correct line number (Issue2384)
|
||||
@ -410,7 +411,7 @@ class TracebackCases(unittest.TestCase):
|
||||
""".format(firstlines, message))
|
||||
|
||||
process = subprocess.Popen([sys.executable, TESTFN],
|
||||
stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env={})
|
||||
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
stdout, stderr = process.communicate()
|
||||
stdout = stdout.decode(output_encoding).splitlines()
|
||||
finally:
|
||||
|
@ -8,6 +8,7 @@ from test.support.script_helper import (assert_python_ok, assert_python_failure,
|
||||
interpreter_requires_environment)
|
||||
from test import support
|
||||
from test.support import os_helper
|
||||
from test.support import force_not_colorized
|
||||
|
||||
try:
|
||||
import _testcapi
|
||||
@ -938,11 +939,12 @@ class TestCommandLine(unittest.TestCase):
|
||||
stdout = stdout.rstrip()
|
||||
self.assertEqual(stdout, b'10')
|
||||
|
||||
@force_not_colorized
|
||||
def check_env_var_invalid(self, nframe):
|
||||
with support.SuppressCrashReport():
|
||||
ok, stdout, stderr = assert_python_failure(
|
||||
'-c', 'pass',
|
||||
PYTHONTRACEMALLOC=str(nframe), __cleanenv=True)
|
||||
PYTHONTRACEMALLOC=str(nframe))
|
||||
|
||||
if b'ValueError: the number of frames must be in range' in stderr:
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user