summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-21 02:11:40 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-21 02:11:40 (GMT)
commit03b0116c781f8b2b530c2452d25d9a372c8f3635 (patch)
tree02169b7651c11558352a6b2bb502e23658e9cbfe
parent853c0f9d601ca23727e1519d9b2ee82ccb45989f (diff)
downloadcpython-03b0116c781f8b2b530c2452d25d9a372c8f3635.zip
cpython-03b0116c781f8b2b530c2452d25d9a372c8f3635.tar.gz
cpython-03b0116c781f8b2b530c2452d25d9a372c8f3635.tar.bz2
#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 e5df6c7..ec971ea 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)