[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#19125)

[benjamin.peterson]

http://hg.python.org/cpython/rev/d55f911c4c9d
changeset:   85832:d55f911c4c9d
parent:      85830:39f9adc8ad5b
parent:      85831:f501475d88de
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 29 10:47:04 2013 -0400
summary:
  merge 3.3 (#19125)

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
@@ -239,14 +239,14 @@
         self.assertEqual(smtp.rset(), expected)
         smtp.quit()
 
-    def testNotImplemented(self):
+    def testELHO(self):
         # EHLO isn't implemented in DebuggingServer
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
-        expected = (502, b'Error: command "EHLO" not implemented')
+        expected = (250, b'\nSIZE 33554432\nHELP')
         self.assertEqual(smtp.ehlo(), expected)
         smtp.quit()
 
-    def testNotImplemented(self):
+    def testEXPNNotImplemented(self):
         # EXPN isn't implemented in DebuggingServer
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
         expected = (502, b'EXPN not implemented')

-- 
Repository URL: http://hg.python.org/cpython