From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:20:54 +0000 (+0200) Subject: gh-128595: Fix `test__colorize` unexpected keyword argument 'file' on buildbots ... X-Git-Tag: v3.14.0a5~328 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=417f7a9ef754eae6d19be23279e9a9a948f6fecb;p=thirdparty%2FPython%2Fcpython.git gh-128595: Fix `test__colorize` unexpected keyword argument 'file' on buildbots (#129070) --- diff --git a/Lib/test/test__colorize.py b/Lib/test/test__colorize.py index 1871775fa205..77e74fa3e23c 100644 --- a/Lib/test/test__colorize.py +++ b/Lib/test/test__colorize.py @@ -9,7 +9,7 @@ ORIGINAL_CAN_COLORIZE = _colorize.can_colorize def setUpModule(): - _colorize.can_colorize = lambda: False + _colorize.can_colorize = lambda *args, **kwargs: False def tearDownModule(): @@ -21,6 +21,7 @@ class TestColorizeFunction(unittest.TestCase): def test_colorized_detection_checks_for_environment_variables(self): flags = unittest.mock.MagicMock(ignore_environment=False) with (unittest.mock.patch("os.isatty") as isatty_mock, + unittest.mock.patch("sys.stdout") as stdout_mock, unittest.mock.patch("sys.stderr") as stderr_mock, unittest.mock.patch("sys.flags", flags), unittest.mock.patch("_colorize.can_colorize", ORIGINAL_CAN_COLORIZE), @@ -29,6 +30,8 @@ class TestColorizeFunction(unittest.TestCase): contextlib.nullcontext()) as vt_mock): isatty_mock.return_value = True + stdout_mock.fileno.return_value = 1 + stdout_mock.isatty.return_value = True stderr_mock.fileno.return_value = 2 stderr_mock.isatty.return_value = True with unittest.mock.patch("os.environ", {'TERM': 'dumb'}): @@ -61,6 +64,7 @@ class TestColorizeFunction(unittest.TestCase): self.assertEqual(_colorize.can_colorize(), True) isatty_mock.return_value = False + stdout_mock.isatty.return_value = False stderr_mock.isatty.return_value = False self.assertEqual(_colorize.can_colorize(), False)