]> granicus.if.org Git - python/commitdiff
#5713: fix timing issue in smtplib tests.
authorR David Murray <rdmurray@bitdance.com>
Thu, 21 Mar 2013 01:54:05 +0000 (21:54 -0400)
committerR David Murray <rdmurray@bitdance.com>
Thu, 21 Mar 2013 01:54:05 +0000 (21:54 -0400)
Lib/test/test_smtplib.py

index 92f986b72ee0dc3b084eff2ccd2c3c3341964d5c..e5df6c7a60983a258d0a6af4fd8dfd0695ceb6fe 100644 (file)
@@ -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)