summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-20 22:11:40 -0400
committerR David Murray <rdmurray@bitdance.com>2013-03-20 22:11:40 -0400
commit7ddb402f873b3a7242d4f129060073971f4ef536 (patch)
tree1e3e12ba85eb1fa3e1e54bd6f1ed4e610e7089d5
parentcf761fd932e233dc2504c0f9d031f37ca74cd24f (diff)
downloadcpython-7ddb402f873b3a7242d4f129060073971f4ef536.tar.gz
#5712: Preemptively fix some other possible timing issues.
-rw-r--r--Lib/test/test_smtplib.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index e5df6c7a60..ec971ea52c 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -626,12 +626,12 @@ class SimSMTPChannel(smtpd.SMTPChannel):
if self.rcpt_response is None:
super().smtp_RCPT(arg)
return
- self.push(self.rcpt_response[self.rcpt_count])
self.rcpt_count += 1
+ self.push(self.rcpt_response[self.rcpt_count-1])
def smtp_RSET(self, arg):
- super().smtp_RSET(arg)
self.rset_count += 1
+ super().smtp_RSET(arg)
def smtp_DATA(self, arg):
if self.data_response is None:
@@ -794,7 +794,7 @@ class SMTPSimTests(unittest.TestCase):
with self.assertRaises(smtplib.SMTPSenderRefused):
smtp.sendmail('John', 'Sally', 'test message')
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):
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)