Skip to content

Commit

Permalink
pythongh-112730: Respect tests that require environment variables wit…
Browse files Browse the repository at this point in the history
…h no-colorize fixes (python#118288)
  • Loading branch information
pablogsal authored Apr 26, 2024
1 parent 5a90de0 commit b43c7e1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Lib/test/test_traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ def f():
])

@requires_subprocess()
@force_not_colorized
def test_encoded_file(self):
# Test that tracebacks are correctly printed for encoded source files:
# - correct line number (Issue2384)
Expand All @@ -410,7 +411,7 @@ def do_test(firstlines, message, charset, lineno):
""".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:
Expand Down
4 changes: 3 additions & 1 deletion Lib/test/test_tracemalloc.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
interpreter_requires_environment)
from test import support
from test.support import os_helper
from test.support import force_not_colorized

try:
import _testcapi
Expand Down Expand Up @@ -938,11 +939,12 @@ def test_env_limit(self):
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
Expand Down

0 comments on commit b43c7e1

Please sign in to comment.