From 5db08d0917f8c89650d740dbf303699aceca2f01 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Thu, 25 Apr 2024 17:18:08 +0100 Subject: [PATCH] gh-112730: Respect tests that require environment variables with no-colorize fixes --- Lib/test/test_traceback.py | 3 ++- Lib/test/test_tracemalloc.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 19611937fc278b..8927fccc289320 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -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) @@ -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: diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py index f685430a7d36ad..5755f7697de91a 100644 --- a/Lib/test/test_tracemalloc.py +++ b/Lib/test/test_tracemalloc.py @@ -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 @@ -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