From 2dff5cd2a24b5e78bea928f3767aaf567d2e3aaf Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 2 Oct 2025 15:31:18 +0200 Subject: [PATCH 1/2] gh-55258: Reenable support test_get_original_stdout() --- Lib/test/test_support.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 711691348ffe7c..fc8e7263cad07b 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -96,7 +96,6 @@ def test_get_attribute(self): self.test_get_attribute) self.assertRaises(unittest.SkipTest, support.get_attribute, self, "foo") - @unittest.skip("failing buildbots") def test_get_original_stdout(self): self.assertEqual(support.get_original_stdout(), sys.stdout) From e2e6a8cead068c3a88a25c976d84f31dac788445 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 2 Oct 2025 16:38:24 +0200 Subject: [PATCH 2/2] Fix for --junit-xml --- Lib/test/test_support.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index fc8e7263cad07b..92909519636cf3 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -97,7 +97,12 @@ def test_get_attribute(self): self.assertRaises(unittest.SkipTest, support.get_attribute, self, "foo") def test_get_original_stdout(self): - self.assertEqual(support.get_original_stdout(), sys.stdout) + if isinstance(sys.stdout, io.StringIO): + # gh-55258: When --junit-xml is used, stdout is a StringIO: + # use sys.__stdout__ in this case. + self.assertEqual(support.get_original_stdout(), sys.__stdout__) + else: + self.assertEqual(support.get_original_stdout(), sys.stdout) def test_unload(self): import sched # noqa: F401