From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 11 Jul 2018 11:14:36 +0000 (+0200)
Subject: bpo-34092, test_logging: increase SMTPHandlerTest timeout (GH-8245) (GH-8249)
X-Git-Tag: v3.6.7rc1~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d68cb9d62c3671dd9aee5cdecb02fcb3268dacf0;p=python

bpo-34092, test_logging: increase SMTPHandlerTest timeout (GH-8245) (GH-8249)

Change test_logging.SMTPHandlerTest timeout from 8 seconds to 1
minute. The test failed randomly on the slow x86 Gentoo Refleaks 3.7
buildbot.

(cherry picked from commit 31b50b8cbfbf49d5fc17c612cf0dfaa4d0c24983)
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 36d88ac637..763a5d1df0 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -959,7 +959,9 @@ if threading:
 
 @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 @@ class SMTPHandlerTest(BaseTest):
         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)