Fixes #14314: Improved SMTP timeout handling.

This commit is contained in:
Vinay Sajip 2012-03-15 12:02:08 +00:00
parent 7cc7033cb4
commit 17160fd6d6
2 changed files with 7 additions and 3 deletions

View file

@ -936,8 +936,9 @@ class SMTPHandlerTest(BaseTest):
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')