From d930b63583a8dc1ece9407652636209a3d396149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= Date: Thu, 6 May 2010 20:21:57 +0000 Subject: [PATCH] Merged revisions 80882 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80882 | giampaolo.rodola | 2010-05-06 22:19:32 +0200 (gio, 06 mag 2010) | 1 line adds handle_error(self):raise to test modules using asyncore to provide a clearer error message in case something goes wrong ........ --- Lib/test/test_ftplib.py | 3 +++ Lib/test/test_smtplib.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index 4e80daee9a1..b949b695ebf 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -50,6 +50,9 @@ def handle_close(self): def push(self, what): super(DummyDTPHandler, self).push(what.encode('ascii')) + def handle_error(self): + raise + class DummyFTPHandler(asynchat.async_chat): diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py index 3a9de5b4b70..d0b2b27f03d 100644 --- a/Lib/test/test_smtplib.py +++ b/Lib/test/test_smtplib.py @@ -374,6 +374,9 @@ def smtp_AUTH(self, arg): else: self.push('550 No access for you!') + def handle_error(self): + raise + class SimSMTPServer(smtpd.SMTPServer): @@ -392,6 +395,9 @@ def process_message(self, peer, mailfrom, rcpttos, data): def add_feature(self, feature): self._extra_features.append(feature) + def handle_error(self): + raise + # Test various SMTP & ESMTP commands/behaviors that require a simulated server # (i.e., something with more features than DebuggingServer)