|
 |
25c6e4 |
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
|
|
|
25c6e4 |
index 14d0060d8ec..1bb66901880 100644
|
|
|
25c6e4 |
--- a/Lib/test/test_smtplib.py
|
|
|
25c6e4 |
+++ b/Lib/test/test_smtplib.py
|
|
|
25c6e4 |
@@ -179,31 +179,31 @@ def tearDown(self):
|
|
|
25c6e4 |
|
|
|
25c6e4 |
def testBasic(self):
|
|
|
25c6e4 |
# connect
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
smtp.quit()
|
|
|
25c6e4 |
|
|
|
25c6e4 |
def testNOOP(self):
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
expected = (250, 'Ok')
|
|
|
25c6e4 |
self.assertEqual(smtp.noop(), expected)
|
|
|
25c6e4 |
smtp.quit()
|
|
|
25c6e4 |
|
|
|
25c6e4 |
def testRSET(self):
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
expected = (250, 'Ok')
|
|
|
25c6e4 |
self.assertEqual(smtp.rset(), expected)
|
|
|
25c6e4 |
smtp.quit()
|
|
|
25c6e4 |
|
|
|
25c6e4 |
def testNotImplemented(self):
|
|
|
25c6e4 |
# EHLO isn't implemented in DebuggingServer
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
expected = (502, 'Error: command "EHLO" not implemented')
|
|
|
25c6e4 |
self.assertEqual(smtp.ehlo(), expected)
|
|
|
25c6e4 |
smtp.quit()
|
|
|
25c6e4 |
|
|
|
25c6e4 |
def testVRFY(self):
|
|
|
25c6e4 |
# VRFY isn't implemented in DebuggingServer
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
expected = (502, 'Error: command "VRFY" not implemented')
|
|
|
25c6e4 |
self.assertEqual(smtp.vrfy('nobody@nowhere.com'), expected)
|
|
|
25c6e4 |
self.assertEqual(smtp.verify('nobody@nowhere.com'), expected)
|
|
|
25c6e4 |
@@ -212,21 +212,21 @@ def testVRFY(self):
|
|
|
25c6e4 |
def testSecondHELO(self):
|
|
|
25c6e4 |
# check that a second HELO returns a message that it's a duplicate
|
|
|
25c6e4 |
# (this behavior is specific to smtpd.SMTPChannel)
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
smtp.helo()
|
|
|
25c6e4 |
expected = (503, 'Duplicate HELO/EHLO')
|
|
|
25c6e4 |
self.assertEqual(smtp.helo(), expected)
|
|
|
25c6e4 |
smtp.quit()
|
|
|
25c6e4 |
|
|
|
25c6e4 |
def testHELP(self):
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
self.assertEqual(smtp.help(), 'Error: command "HELP" not implemented')
|
|
|
25c6e4 |
smtp.quit()
|
|
|
25c6e4 |
|
|
|
25c6e4 |
def testSend(self):
|
|
|
25c6e4 |
# connect and send mail
|
|
|
25c6e4 |
m = 'A test message'
|
|
|
25c6e4 |
- smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
|
|
25c6e4 |
+ smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
|
|
25c6e4 |
smtp.sendmail('John', 'Sally', m)
|
|
|
25c6e4 |
# XXX(nnorwitz): this test is flaky and dies with a bad file descriptor
|
|
|
25c6e4 |
# in asyncore. This sleep might help, but should really be fixed
|