commit 17160fd6d6d7850294a9a465a3e5e399e5028bb6
author Vinay Sajip <vinay_sajip@yahoo.co.uk> Thu Mar 15 12:02:08 2012 +0000
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> Thu Mar 15 12:02:08 2012 +0000
tree 0ba75e61d7a0e93d7b7a86e9e66da834462a20ef
parent 7cc7033cb428ad74366f93e8ebcb4bb74f3f6511

Fixes #14314: Improved SMTP timeout handling.

Lib/test/test_logging.py

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index be84be6..b0f8f9f 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -936,8 +936,9 @@
         r = logging.makeLogRecord({'msg': 'Hello'})
         self.handled = threading.Event()
         h.handle(r)
-        self.handled.wait()
+        self.handled.wait(5.0)  # 14314: don't wait forever
         server.stop()
+        self.assertTrue(self.handled.is_set())
         self.assertEqual(len(self.messages), 1)
         peer, mailfrom, rcpttos, data = self.messages[0]
         self.assertEqual(mailfrom, 'me')