Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge: #5712: Preemptively fix some other possible timing issues.

This commit is contained in:
R David Murray 2013-03-20 22:12:53 -04:00
parent ba7d9d46f2 54bd49d49b
commit dac94d619c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_smtplib.py
View File

@ -662,12 +662,12 @@ class SimSMTPChannel(smtpd.SMTPChannel):
if self.rcpt_response is None: if self.rcpt_response is None:
super().smtp_RCPT(arg) super().smtp_RCPT(arg)
return return
self.push(self.rcpt_response[self.rcpt_count])
self.rcpt_count += 1 self.rcpt_count += 1
self.push(self.rcpt_response[self.rcpt_count-1])
def smtp_RSET(self, arg): def smtp_RSET(self, arg):
super().smtp_RSET(arg)
self.rset_count += 1 self.rset_count += 1
super().smtp_RSET(arg)
def smtp_DATA(self, arg): def smtp_DATA(self, arg):
if self.data_response is None: if self.data_response is None:
@ -847,7 +847,7 @@ class SMTPSimTests(unittest.TestCase):
with self.assertRaises(smtplib.SMTPSenderRefused): with self.assertRaises(smtplib.SMTPSenderRefused):
smtp.sendmail('John', 'Sally', 'test message') smtp.sendmail('John', 'Sally', 'test message')
self.assertIsNone(smtp.sock) self.assertIsNone(smtp.sock)
self.assertEqual(self.serv._SMTPchannel.rcpt_count, 0) self.assertEqual(self.serv._SMTPchannel.rset_count, 0)
def test_421_from_rcpt_cmd(self): def test_421_from_rcpt_cmd(self):
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15) smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)