From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 14:46:31 +0000 (-0400)
Subject: fix test to run and test that smtpd does support ELHO (closes #19125)
X-Git-Tag: v3.4.0a4~310^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1eca062be691af2fe82724c9c5c5acbfc7ed72f8;p=thirdparty%2FPython%2Fcpython.git

fix test to run and test that smtpd does support ELHO (closes #19125)
---

diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index f93d355285da..8d1dbbfc4364 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -239,14 +239,14 @@ class DebuggingServerTests(unittest.TestCase):
         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')