dummysmtpd: accept additional kwargs from stdlib smtpd
authorAugie Fackler <augie@google.com>
Thu, 09 Aug 2018 17:46:07 -0400
changeset 39029 78f1899e4202
parent 39028 713126389ef2
child 39030 1eb779a86c4e
dummysmtpd: accept additional kwargs from stdlib smtpd This was causing extremely mysterious failures because smtpd is implemented using asynchat, which in turn doesn't appear to do anything *remotely* helpful if an exception occurs. # no-check-commit because I'm editing a foo_bar function signature test-patchbomb-tls.t now passes in Python 3, but only because it doesn't check message bodies like test-patchbomb.t. test-patchbomb.t is *full* of doubled headers in the output (eg [0]) which seems like an odd failure mode. 0: @@ -141,12 +154,17 @@ MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit + MIME-Version: 1.0 + Content-Type: text/plain; charset="us-ascii" + Content-Transfer-Encoding: 7bit Subject: [PATCH] bookmark X-Mercurial-Node: 8dab2639fd35f1e337ad866c372a5c44f1064e3c X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 1 Differential Revision: https://phab.mercurial-scm.org/D4219
contrib/python3-whitelist
tests/dummysmtpd.py
--- a/contrib/python3-whitelist	Thu Aug 09 17:44:36 2018 -0400
+++ b/contrib/python3-whitelist	Thu Aug 09 17:46:07 2018 -0400
@@ -363,6 +363,7 @@
 test-parseindex2.py
 test-patch-offset.t
 test-patch.t
+test-patchbomb-tls.t
 test-pathconflicts-merge.t
 test-pathconflicts-update.t
 test-pathencode.py
--- a/tests/dummysmtpd.py	Thu Aug 09 17:44:36 2018 -0400
+++ b/tests/dummysmtpd.py	Thu Aug 09 17:46:07 2018 -0400
@@ -26,7 +26,7 @@
     def __init__(self, localaddr):
         smtpd.SMTPServer.__init__(self, localaddr, remoteaddr=None)
 
-    def process_message(self, peer, mailfrom, rcpttos, data):
+    def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
         log('%s from=%s to=%s\n' % (peer[0], mailfrom, ', '.join(rcpttos)))
 
     def handle_error(self):