]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-34092, test_logging: increase SMTPHandlerTest timeout (GH-8245) (GH-8247)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 11 Jul 2018 13:56:45 +0000 (06:56 -0700)
committerVictor Stinner <vstinner@redhat.com>
Wed, 11 Jul 2018 13:56:45 +0000 (15:56 +0200)
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)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
Lib/test/test_logging.py

index 62ec4b5148522fbd455bd7be358a628b76221851..13f49f6cc305e309665783a9344ef6aedc16b582 100644 (file)
@@ -971,7 +971,8 @@ if hasattr(socket, "AF_UNIX"):
 # - end of server_helper section
 
 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 = {}
@@ -986,7 +987,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)