This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4219

dummysmtpd: accept additional kwargs from stdlib smtpd
ClosedPublic

Authored by durin42 on Aug 9 2018, 6:06 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG78f1899e4202: dummysmtpd: accept additional kwargs from stdlib smtpd

Summary

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

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Aug 9 2018, 6:06 PM

Herald added a reviewer: pulkit. · View Herald TranscriptAug 9 2018, 6:06 PM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D4220: tests: fix Python3 issues in Python one-liners in test-patchbomb.t.Aug 9 2018, 6:33 PM

Closed by commit rHG78f1899e4202: dummysmtpd: accept additional kwargs from stdlib smtpd (authored by durin42). · Explain WhyAug 9 2018, 11:07 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/python3-whitelist (1 line)
M			tests/dummysmtpd.py (2 lines)

Status	Author	Revision
Closed	durin42	D4234 tests: allow for a bonus newline in base64'd email payload
Closed	durin42	D4233 mail: be more cautious about bytes vs str for py3 compat
Closed	durin42	D4232 patchbomb: use native strings when determining attachment disposition
Closed	durin42	D4231 mail: always fall back to iso-8859-1 if us-ascii won't work (BC)
Closed	durin42	D4230 tests: put some Python 3 polish on inline Python invocations
Closed	durin42	D4229 patchbomb: don't unintentionally duplicate headers
Closed	durin42	D4228 patchbomb: use sysstrs when describing content-type
Closed	durin42	D4223 patchbomb: use native strs for email header keys and values
Closed	durin42	D4222 patchbomb: use email.encoders instead of email.Encoders
Closed	durin42	D4221 mail: properly handle email addresses typically being unicodes
Closed	durin42	D4220 tests: fix Python3 issues in Python one-liners in test-patchbomb.t
Closed	durin42	D4219 dummysmtpd: accept additional kwargs from stdlib smtpd
Closed	durin42	D4218 mail: fix debug print, which appears to have been broken for a long time
Closed	durin42	D3957 patchbomb: python 3 really wants those email addresses in unicode
Closed	durin42	D3956 mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile
Closed	durin42	D3955 mail: modernize check for Python-with-TLS
Closed	durin42	D3954 mail: cope with Py3 unicode antics on email addresses
Closed	durin42	D3953 mail: fix _encode to be more correct on Python 3
Closed	durin42	D3951 patchbomb: work around email module really wanting to write unicode data

Diff 10251

contrib/python3-whitelist

	test-obsolete-distributed.t			test-obsolete-distributed.t
	test-obsolete-divergent.t			test-obsolete-divergent.t
	test-obsolete-tag-cache.t			test-obsolete-tag-cache.t
	test-pager.t			test-pager.t
	test-parents.t			test-parents.t
	test-parseindex2.py			test-parseindex2.py
	test-patch-offset.t			test-patch-offset.t
	test-patch.t			test-patch.t
				test-patchbomb-tls.t
	test-pathconflicts-merge.t			test-pathconflicts-merge.t
	test-pathconflicts-update.t			test-pathconflicts-update.t
	test-pathencode.py			test-pathencode.py
	test-pending.t			test-pending.t
	test-permissions.t			test-permissions.t
	test-phases.t			test-phases.t
	test-pull-branch.t			test-pull-branch.t
	test-pull-http.t			test-pull-http.t

tests/dummysmtpd.py

	def log(msg):			def log(msg):
	sys.stdout.write(msg)			sys.stdout.write(msg)
	sys.stdout.flush()			sys.stdout.flush()

	class dummysmtpserver(smtpd.SMTPServer):			class dummysmtpserver(smtpd.SMTPServer):
	def __init__(self, localaddr):			def __init__(self, localaddr):
	smtpd.SMTPServer.__init__(self, localaddr, remoteaddr=None)			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)))			log('%s from=%s to=%s\n' % (peer[0], mailfrom, ', '.join(rcpttos)))

	def handle_error(self):			def handle_error(self):
	# On Windows, a bad SSL connection sometimes generates a WSAECONNRESET.			# On Windows, a bad SSL connection sometimes generates a WSAECONNRESET.
	# The default handler will shutdown this server, and then both the			# The default handler will shutdown this server, and then both the
	# current connection and subsequent ones fail on the client side with			# current connection and subsequent ones fail on the client side with
	# "No connection could be made because the target machine actively			# "No connection could be made because the target machine actively
	# refused it". If we eat the error, then the client properly aborts in			# refused it". If we eat the error, then the client properly aborts in

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	10213		Aug 9 2018, 6:06 PM	★	★
Diff 2	10251	rHG78f1899e4202c802b31296d52e0e873dbd25d82c	Aug 9 2018, 5:46 PM	★	★