| @@ -971,7 +971,8 @@ class TestUnixDatagramServer(TestUDPServer): |
|
|
| 971 |
971 |
# - end of server_helper section |
| 972 |
972 |
|
| 973 |
973 |
class SMTPHandlerTest(BaseTest): |
| 974 |
|
-TIMEOUT = 8.0 |
|
974 |
+# bpo-14314, bpo-19665, bpo-34092: don't wait forever, timeout of 1 minute |
|
975 |
+TIMEOUT = 60.0 |
| 975 |
976 |
|
| 976 |
977 |
def test_basic(self): |
| 977 |
978 |
sockmap = {} |
| @@ -986,7 +987,7 @@ def test_basic(self): |
|
|
| 986 |
987 |
r = logging.makeLogRecord({'msg': 'Hello \u2713'}) |
| 987 |
988 |
self.handled = threading.Event() |
| 988 |
989 |
h.handle(r) |
| 989 |
|
-self.handled.wait(self.TIMEOUT) # 14314: don't wait forever |
|
990 |
+self.handled.wait(self.TIMEOUT) |
| 990 |
991 |
server.stop() |
| 991 |
992 |
self.assertTrue(self.handled.is_set()) |
| 992 |
993 |
self.assertEqual(len(self.messages), 1) |