summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-21 01:54:05 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-21 01:54:05 (GMT)
commit853c0f9d601ca23727e1519d9b2ee82ccb45989f (patch)
treedd497426b64572b2f01b79fc0e049ef826c52f96
parent1f8a40b81d359c66b6b67dd0f532a655cf490b68 (diff)
downloadcpython-853c0f9d601ca23727e1519d9b2ee82ccb45989f.zip
cpython-853c0f9d601ca23727e1519d9b2ee82ccb45989f.tar.gz
cpython-853c0f9d601ca23727e1519d9b2ee82ccb45989f.tar.bz2
#5713: fix timing issue in smtplib tests.
-rw-r--r--Lib/test/test_smtplib.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 92f986b..e5df6c7 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -789,6 +789,7 @@ class SMTPSimTests(unittest.TestCase):
# Issue 5713: make sure close, not rset, is called if we get a 421 error
def test_421_from_mail_cmd(self):
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
+ smtp.noop()
self.serv._SMTPchannel.mail_response = '421 closing connection'
with self.assertRaises(smtplib.SMTPSenderRefused):
smtp.sendmail('John', 'Sally', 'test message')
@@ -797,6 +798,7 @@ class SMTPSimTests(unittest.TestCase):
def test_421_from_rcpt_cmd(self):
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
+ smtp.noop()
self.serv._SMTPchannel.rcpt_response = ['250 accepted', '421 closing']
with self.assertRaises(smtplib.SMTPRecipientsRefused) as r:
smtp.sendmail('John', ['Sally', 'Frank', 'George'], 'test message')
@@ -813,6 +815,7 @@ class SMTPSimTests(unittest.TestCase):
super().found_terminator()
self.serv.channel_class = MySimSMTPChannel
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
+ smtp.noop()
with self.assertRaises(smtplib.SMTPDataError):
smtp.sendmail('John@foo.org', ['Sally@foo.org'], 'test message')
self.assertIsNone(smtp.sock)