aboutsummaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-07-11 12:35:38 +0200
committerGitHub <noreply@github.com>2018-07-11 12:35:38 +0200
commit31b50b8cbfbf49d5fc17c612cf0dfaa4d0c24983 (patch)
tree60c1ae04c3caf2155fb027f2ac482f7dea8b8810 /Lib
parentSimplify __all__ in multiprocessing (GH-6856) (diff)
downloadcpython-31b50b8cbfbf49d5fc17c612cf0dfaa4d0c24983.tar.gz
cpython-31b50b8cbfbf49d5fc17c612cf0dfaa4d0c24983.tar.bz2
cpython-31b50b8cbfbf49d5fc17c612cf0dfaa4d0c24983.zip
bpo-34092, test_logging: increase SMTPHandlerTest timeout (GH-8245)
Change test_logging.SMTPHandlerTest timeout from 8 seconds to 1 minute. The test failed randomly on the slow x86 Gentoo Refleaks 3.7 buildbot.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_logging.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index a3731fa4793..f7232f67eee 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -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)