[Python-checkins] cpython (3.2): #5712: Preemptively fix some other possible timing issues.

Thu Mar 21 03:13:45 CET 2013

http://hg.python.org/cpython/rev/2ce557101136
changeset: 82858:2ce557101136
branch: 3.2
parent: 82855:fbf54209de75
user: R David Murray <rdmurray at bitdance.com>
date: Wed Mar 20 22:11:40 2013 -0400
summary:
 #5712: Preemptively fix some other possible timing issues.
files:
 Lib/test/test_smtplib.py | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -626,12 +626,12 @@
 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):
+ self.rset_count += 1
 super().smtp_RSET(arg)
- self.rset_count += 1
 
 def smtp_DATA(self, arg):
 if self.data_response is None:
@@ -794,7 +794,7 @@
 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)
-- 
Repository URL: http://hg.python.org/cpython
