From: Pablo Galindo Salgado <Pablogsal@gmail.com>
Date: Fri, 26 Apr 2024 20:23:30 +0000 (+0100)
Subject: gh-112730: Respect tests that require environment variables with no-colorize fixes... 
X-Git-Tag: v3.13.0b1~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b43c7e1070e515b3e94043ff777ab83074234051;p=thirdparty%2FPython%2Fcpython.git

gh-112730: Respect tests that require environment variables with no-colorize fixes (#118288)
---

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 19611937fc27..8927fccc2893 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -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:
diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py
index f685430a7d36..5755f7697de9 100644
--- a/Lib/test/test_tracemalloc.py
+++ b/Lib/test/test_tracemalloc.py
@@ -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