diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 36d88ac63781c5..763a5d1df0e3a4 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -959,7 +959,9 @@ class TestUnixDatagramServer(TestUDPServer): @unittest.skipUnless(threading, 'Threading required for this test.') class SMTPHandlerTest(BaseTest): - TIMEOUT = 8.0 + # bpo-14314, bpo-19665, bpo-34092: don't wait forever, timeout of 1 minute + TIMEOUT = 60.0 + def test_basic(self): sockmap = {} server = TestSMTPServer((support.HOST, 0), self.process_message, 0.001, @@ -973,7 +975,7 @@ def test_basic(self): r = logging.makeLogRecord({'msg': 'Hello \u2713'}) self.handled = threading.Event() h.handle(r) - self.handled.wait(self.TIMEOUT) # 14314: don't wait forever + self.handled.wait(self.TIMEOUT) server.stop() self.assertTrue(self.handled.is_set()) self.assertEqual(len(self.messages), 1)