Merge branch 'main' of https://github.com/python/cpython into wasi.py

brettcannon · Nov 16, 2023 · cfefcf0 · cfefcf0
2 parents 082e976 + 974847b
commit cfefcf0
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
@@ -1234,11 +1234,9 @@ def test_recursive_repr(self):
         # Issue #25455
         raw = self.MockRawIO()
         b = self.tp(raw)
-        with support.swap_attr(raw, 'name', b):
-            try:
+        with support.swap_attr(raw, 'name', b), support.infinite_recursion(25):
+            with self.assertRaises(RuntimeError):
                 repr(b)  # Should not crash
-            except RuntimeError:
-                pass
 
     def test_flush_error_on_close(self):
         # Test that buffered file is closed despite failed flush
@@ -2801,11 +2799,9 @@ def test_recursive_repr(self):
         # Issue #25455
         raw = self.BytesIO()
         t = self.TextIOWrapper(raw, encoding="utf-8")
-        with support.swap_attr(raw, 'name', t):
-            try:
+        with support.swap_attr(raw, 'name', t), support.infinite_recursion(25):
+            with self.assertRaises(RuntimeError):
                 repr(t)  # Should not crash
-            except RuntimeError:
-                pass
 
     def test_line_buffering(self):
         r = self.BytesIO()