This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4230

tests: put some Python 3 polish on inline Python invocations
ClosedPublic

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

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG598467614c15: tests: put some Python 3 polish on inline Python invocations

Summary

A couple of these became inline python sessions because they got more
involved, and one of them is super-annoying and writes directly to
sys.stdout.buffer because I just couldn't make it work any other way.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

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

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 9 2018, 10:06 PM

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

durin42 added a child revision: D4231: mail: always fall back to iso-8859-1 if us-ascii won't work (BC).Aug 9 2018, 10:07 PM

Closed by commit rHG598467614c15: tests: put some Python 3 polish on inline Python invocations (authored by durin42). · Explain WhyAug 9 2018, 11:22 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-patchbomb.t (16 lines)

Commit	Parents	Author	Summary	Date
		Augie Fackler		Aug 9 2018, 8:57 PM

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 10224

tests/test-patchbomb.t

	MGUxM2U5ZCBkZXNjcmlwdGlvbgotLS0gL2Rldi9udWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3			MGUxM2U5ZCBkZXNjcmlwdGlvbgotLS0gL2Rldi9udWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3
	MCArMDAwMAorKysgYi9kZXNjcmlwdGlvbglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK			MCArMDAwMAorKysgYi9kZXNjcmlwdGlvbglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK
	QEAgLTAsMCArMSwzIEBACithIG11bHRpbGluZQorCitkZXNjcmlwdGlvbgpkaWZmIC1yIGZmMmM5			QEAgLTAsMCArMSwzIEBACithIG11bHRpbGluZQorCitkZXNjcmlwdGlvbgpkaWZmIC1yIGZmMmM5
	ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDow			ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDow
	MDowMCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK			MDowMCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK
	QEAgLTAsMCArMSwxIEBACitow7ZtbWEhCg==			QEAgLTAsMCArMSwxIEBACitow7ZtbWEhCg==


	$ $PYTHON -c 'print open("mbox").read().split("\n\n")[1].decode("base64")'			>>> import base64
				>>> patch = base64.b64decode(open("mbox").read().split("\n\n")[1])
				>>> if not isinstance(patch, str):
				... import sys
				... sys.stdout.flush()
				... junk = sys.stdout.buffer.write(patch + b"\n")
				... else:
				... print(patch)
	# HG changeset patch			# HG changeset patch
	# User test			# User test
	# Date 4 0			# Date 4 0
	# Thu Jan 01 00:00:04 1970 +0000			# Thu Jan 01 00:00:04 1970 +0000
	# Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f			# Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
	# Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f			# Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
	utf-8 content			utf-8 content

	diff -r ff2c9fa2018b -r 909a00e13e9d description			diff -r ff2c9fa2018b -r 909a00e13e9d description
	--- /dev/null Thu Jan 01 00:00:00 1970 +0000			--- /dev/null Thu Jan 01 00:00:00 1970 +0000
	+++ b/description Thu Jan 01 00:00:04 1970 +0000			+++ b/description Thu Jan 01 00:00:04 1970 +0000
	@@ -0,0 +1,3 @@			@@ -0,0 +1,3 @@
	+a multiline			+a multiline
	+			+
	+description			+description
	diff -r ff2c9fa2018b -r 909a00e13e9d utf			diff -r ff2c9fa2018b -r 909a00e13e9d utf
	--- /dev/null Thu Jan 01 00:00:00 1970 +0000			--- /dev/null Thu Jan 01 00:00:00 1970 +0000
	+++ b/utf Thu Jan 01 00:00:04 1970 +0000			+++ b/utf Thu Jan 01 00:00:04 1970 +0000
	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+h\xc3\xb6mma! (esc)			+h\xc3\xb6mma! (esc)

	$ rm mbox			$ rm mbox

	mime encoded mbox (quoted-printable):			mime encoded mbox (quoted-printable):
	$ $PYTHON -c 'fp = open("long", "wb"); fp.write(b"%s\nfoo\n\nbar\n" % ("x" * 1024)); fp.close();'			$ $PYTHON -c 'fp = open("long", "wb"); fp.write(b"%s\nfoo\n\nbar\n" % (b"x" * 1024)); fp.close();'
	$ hg commit -A -d '4 0' -m 'long line'			$ hg commit -A -d '4 0' -m 'long line'
	adding long			adding long

	no mime encoding for email --test:			no mime encoding for email --test:
	$ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n			$ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n
	this patch series consists of 1 patches.			this patch series consists of 1 patches.


	diff -r 000000000000 -r 8580ff50825a a			diff -r 000000000000 -r 8580ff50825a a
	--- /dev/null Thu Jan 01 00:00:00 1970 +0000			--- /dev/null Thu Jan 01 00:00:00 1970 +0000
	+++ b/a Thu Jan 01 00:00:01 1970 +0000			+++ b/a Thu Jan 01 00:00:01 1970 +0000
	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+a			+a


	test multi-byte domain parsing:			test multi-byte domain parsing:
	$ UUML=`$PYTHON -c 'import sys; sys.stdout.write("\374")'`			>>> with open('toaddress.txt', 'wb') as f:
				... f.write(b'bar@\xfcnicode.com') and None
	$ HGENCODING=iso-8859-1			$ HGENCODING=iso-8859-1
	$ export HGENCODING			$ export HGENCODING
	$ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" -s test -r 0			$ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "`cat toaddress.txt`" -s test -r 0
	this patch series consists of 1 patches.			this patch series consists of 1 patches.

	Cc:			Cc:

	sending [PATCH] test ...			sending [PATCH] test ...

	$ cat tmp.mbox			$ cat tmp.mbox
	From quux ... ... .. ..:..:.. .... (re)			From quux ... ... .. ..:..:.. .... (re)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	10224		Aug 9 2018, 10:06 PM	★	★
Diff 2	10262	rHG598467614c15b96519a1de0c80bb70d36e61e46f	Aug 9 2018, 8:57 PM	★	★