From: Victor Stinner <vstinner@python.org>
Date: Thu, 2 Oct 2025 16:10:36 +0000 (+0200)
Subject: gh-55258: Reenable support test_get_original_stdout() (#139499)
X-Git-Tag: v3.15.0a1~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bf69659e178d3fbd6996ec8beba563a843bbf6e;p=thirdparty%2FPython%2Fcpython.git

gh-55258: Reenable support test_get_original_stdout() (#139499)
---

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 711691348ffe..92909519636c 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -96,9 +96,13 @@ class TestSupport(unittest.TestCase):
                         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)
+        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