Merge branch 'gh-117552-test_logging' into nogil-integration

colesbury · colesbury · commit bf23f92d49b0 · 2024-04-04T20:28:02.000Z
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
@@ -2191,7 +2191,8 @@ def test_output(self):
                 self.handled.clear()
                 msg = "sp\xe4m"
                 logger.error(msg)
-                self.handled.wait()
+                handled = self.handled.wait(support.SHORT_TIMEOUT)
+                self.assertTrue(handled, "HTTP request timed out")
                 self.assertEqual(self.log_data.path, '/frob')
                 self.assertEqual(self.command, method)
                 if method == 'GET':
