From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 3 Dec 2013 11:28:55 +0000 (+0000)
Subject: Issue #19665: Increased timeout for SMTPHandler test.
X-Git-Tag: v3.4.0b2~367^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=827f5d35e592c21e4bb82afb702c6496cf77c2ad;p=thirdparty%2FPython%2Fcpython.git

Issue #19665: Increased timeout for SMTPHandler test.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index ae4ca184442c..8c6e6b81167c 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -959,19 +959,21 @@ if threading:
 
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class SMTPHandlerTest(BaseTest):
+    TIMEOUT = 8.0
     def test_basic(self):
         sockmap = {}
         server = TestSMTPServer(('localhost', 0), self.process_message, 0.001,
                                 sockmap)
         server.start()
         addr = ('localhost', server.port)
-        h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log', timeout=5.0)
+        h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log',
+                                         timeout=self.TIMEOUT)
         self.assertEqual(h.toaddrs, ['you'])
         self.messages = []
         r = logging.makeLogRecord({'msg': 'Hello'})
         self.handled = threading.Event()
         h.handle(r)
-        self.handled.wait(5.0)  # 14314: don't wait forever
+        self.handled.wait(self.TIMEOUT)  # 14314: don't wait forever
         server.stop()
         self.assertTrue(self.handled.is_set())
         self.assertEqual(len(self.messages), 1)