diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-09-29 14:47:04 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-09-29 14:47:04 (GMT) |
| commit | e86eb89b97ddc023fdf99681c90976d5e2876ef2 (patch) | |
| tree | e031ba55720098b53a3121929265bfca4c599823 /Lib/test/test_smtplib.py | |
| parent | 11f34caac4b6b6c975dc133180a36ca5663b8b6d (diff) | |
| parent | 1eca062be691af2fe82724c9c5c5acbfc7ed72f8 (diff) | |
| download | cpython-e86eb89b97ddc023fdf99681c90976d5e2876ef2.zip cpython-e86eb89b97ddc023fdf99681c90976d5e2876ef2.tar.gz cpython-e86eb89b97ddc023fdf99681c90976d5e2876ef2.tar.bz2 | |
merge 3.3 (#19125)
Diffstat (limited to 'Lib/test/test_smtplib.py')
| -rw-r--r-- | 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 index 8f64ec1..a501f40 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') |