mirror of
https://github.com/python/cpython.git
synced 2026-01-06 15:32:22 +00:00
[3.13] gh-128595: Add test class helper to force no terminal colour (GH-128687) (#128778)
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
This commit is contained in:
parent
05bd6cbe61
commit
afcf238ed4
4 changed files with 44 additions and 21 deletions
|
|
@ -60,6 +60,7 @@
|
|||
"skip_on_s390x",
|
||||
"without_optimizer",
|
||||
"force_not_colorized",
|
||||
"force_not_colorized_test_class",
|
||||
"BrokenIter",
|
||||
]
|
||||
|
||||
|
|
@ -2693,30 +2694,44 @@ def is_slot_wrapper(name, value):
|
|||
yield name, True
|
||||
|
||||
|
||||
@contextlib.contextmanager
|
||||
def no_color():
|
||||
import _colorize
|
||||
from .os_helper import EnvironmentVarGuard
|
||||
|
||||
with (
|
||||
swap_attr(_colorize, "can_colorize", lambda: False),
|
||||
EnvironmentVarGuard() as env,
|
||||
):
|
||||
for var in {"FORCE_COLOR", "NO_COLOR", "PYTHON_COLORS"}:
|
||||
env.unset(var)
|
||||
env.set("NO_COLOR", "1")
|
||||
yield
|
||||
|
||||
|
||||
def force_not_colorized(func):
|
||||
"""Force the terminal not to be colorized."""
|
||||
@functools.wraps(func)
|
||||
def wrapper(*args, **kwargs):
|
||||
import _colorize
|
||||
original_fn = _colorize.can_colorize
|
||||
variables: dict[str, str | None] = {
|
||||
"PYTHON_COLORS": None, "FORCE_COLOR": None, "NO_COLOR": None
|
||||
}
|
||||
try:
|
||||
for key in variables:
|
||||
variables[key] = os.environ.pop(key, None)
|
||||
os.environ["NO_COLOR"] = "1"
|
||||
_colorize.can_colorize = lambda: False
|
||||
with no_color():
|
||||
return func(*args, **kwargs)
|
||||
finally:
|
||||
_colorize.can_colorize = original_fn
|
||||
del os.environ["NO_COLOR"]
|
||||
for key, value in variables.items():
|
||||
if value is not None:
|
||||
os.environ[key] = value
|
||||
return wrapper
|
||||
|
||||
|
||||
def force_not_colorized_test_class(cls):
|
||||
"""Force the terminal not to be colorized for the entire test class."""
|
||||
original_setUpClass = cls.setUpClass
|
||||
|
||||
@classmethod
|
||||
@functools.wraps(cls.setUpClass)
|
||||
def new_setUpClass(cls):
|
||||
cls.enterClassContext(no_color())
|
||||
original_setUpClass()
|
||||
|
||||
cls.setUpClass = new_setUpClass
|
||||
return cls
|
||||
|
||||
|
||||
def initialized_with_pyrepl():
|
||||
"""Detect whether PyREPL was used during Python initialization."""
|
||||
# If the main module has a __file__ attribute it's a Python module, which means PyREPL.
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
from textwrap import dedent
|
||||
from contextlib import ExitStack
|
||||
from unittest import mock
|
||||
from test.support import force_not_colorized_test_class
|
||||
from test.support import import_helper
|
||||
|
||||
|
||||
code = import_helper.import_module('code')
|
||||
|
||||
|
||||
|
|
@ -30,6 +30,7 @@ def mock_sys(self):
|
|||
del self.sysmod.ps2
|
||||
|
||||
|
||||
@force_not_colorized_test_class
|
||||
class TestInteractiveConsole(unittest.TestCase, MockSys):
|
||||
maxDiff = None
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
from test.support.os_helper import TESTFN, unlink
|
||||
from test.support.script_helper import assert_python_ok, assert_python_failure
|
||||
from test.support.import_helper import forget
|
||||
from test.support import force_not_colorized
|
||||
from test.support import force_not_colorized, force_not_colorized_test_class
|
||||
|
||||
import json
|
||||
import textwrap
|
||||
|
|
@ -1709,6 +1709,7 @@ def f():
|
|||
|
||||
|
||||
@requires_debug_ranges()
|
||||
@force_not_colorized_test_class
|
||||
class PurePythonTracebackErrorCaretTests(
|
||||
PurePythonExceptionFormattingMixin,
|
||||
TracebackErrorLocationCaretTestBase,
|
||||
|
|
@ -1722,6 +1723,7 @@ class PurePythonTracebackErrorCaretTests(
|
|||
|
||||
@cpython_only
|
||||
@requires_debug_ranges()
|
||||
@force_not_colorized_test_class
|
||||
class CPythonTracebackErrorCaretTests(
|
||||
CAPIExceptionFormattingMixin,
|
||||
TracebackErrorLocationCaretTestBase,
|
||||
|
|
@ -1733,6 +1735,7 @@ class CPythonTracebackErrorCaretTests(
|
|||
|
||||
@cpython_only
|
||||
@requires_debug_ranges()
|
||||
@force_not_colorized_test_class
|
||||
class CPythonTracebackLegacyErrorCaretTests(
|
||||
CAPIExceptionFormattingLegacyMixin,
|
||||
TracebackErrorLocationCaretTestBase,
|
||||
|
|
@ -2144,10 +2147,12 @@ def test_print_exception_bad_type_python(self):
|
|||
boundaries = re.compile(
|
||||
'(%s|%s)' % (re.escape(cause_message), re.escape(context_message)))
|
||||
|
||||
@force_not_colorized_test_class
|
||||
class TestTracebackFormat(unittest.TestCase, TracebackFormatMixin):
|
||||
pass
|
||||
|
||||
@cpython_only
|
||||
@force_not_colorized_test_class
|
||||
class TestFallbackTracebackFormat(unittest.TestCase, TracebackFormatMixin):
|
||||
DEBUG_RANGES = False
|
||||
def setUp(self) -> None:
|
||||
|
|
@ -2935,6 +2940,7 @@ def f():
|
|||
self.assertEqual(report, expected)
|
||||
|
||||
|
||||
@force_not_colorized_test_class
|
||||
class PyExcReportingTests(BaseExceptionReportingTests, unittest.TestCase):
|
||||
#
|
||||
# This checks reporting through the 'traceback' module, with both
|
||||
|
|
@ -2951,6 +2957,7 @@ def get_report(self, e):
|
|||
return s
|
||||
|
||||
|
||||
@force_not_colorized_test_class
|
||||
class CExcReportingTests(BaseExceptionReportingTests, unittest.TestCase):
|
||||
#
|
||||
# This checks built-in reporting by the interpreter.
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
import io
|
||||
import sys
|
||||
import textwrap
|
||||
|
||||
from test.support import warnings_helper, captured_stdout
|
||||
|
||||
import traceback
|
||||
import unittest
|
||||
from unittest.util import strclass
|
||||
from test.support import warnings_helper
|
||||
from test.support import captured_stdout, force_not_colorized_test_class
|
||||
from test.test_unittest.support import BufferedWriter
|
||||
|
||||
|
||||
|
|
@ -758,6 +757,7 @@ def testFoo(self):
|
|||
runner.run(Test('testFoo'))
|
||||
|
||||
|
||||
@force_not_colorized_test_class
|
||||
class TestOutputBuffering(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue