Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-93121: fix test_mailbox where some test cases were accidentally dropped #93242

Merged
merged 7 commits into from
Apr 6, 2023
Merged

gh-93121: fix test_mailbox where some test cases were accidentally dropped #93242

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7188252
changed _sample_headers from a map to list + tuples to allow duplicat…
AGZain May 26, 2022
a5d36df
📜🤖 Added by blurb_it.
blurb-it[bot] May 28, 2022
d3cb1ab
📜🤖 Added by blurb_it.
blurb-it[bot] May 28, 2022
1c2a201
Styling updates Lib/test/test_mailbox.py
AGZain May 28, 2022
1ea1785
Delete duplicate news file
iritkatriel Nov 9, 2022
786bc4a
Merge branch 'main' into fix-issue-93121
iritkatriel Apr 6, 2023
4995a87
Minor test changes don't require a news file
iritkatriel Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions Lib/test/test_mailbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _check_sample(self, msg):
# Inspect a mailbox.Message representation of the sample message
self.assertIsInstance(msg, email.message.Message)
self.assertIsInstance(msg, mailbox.Message)
for key, value in _sample_headers.items():
for key, value in _sample_headers:
self.assertIn(value, msg.get_all(key))
self.assertTrue(msg.is_multipart())
self.assertEqual(len(msg.get_payload()), len(_sample_payloads))
Expand Down Expand Up @@ -2264,30 +2264,31 @@ def test_nonempty_maildir_both(self):

_bytes_sample_message = _sample_message.encode('ascii')

_sample_headers = {
"Return-Path":"<[email protected]>",
"X-Original-To":"gkj+person@localhost",
"Delivered-To":"gkj+person@localhost",
"Received":"""from localhost (localhost [127.0.0.1])
_sample_headers = [
("Return-Path", "<[email protected]>"),
("X-Original-To", "gkj+person@localhost"),
("Delivered-To", "gkj+person@localhost"),
("Received", """from localhost (localhost [127.0.0.1])
by andy.gregorykjohnson.com (Postfix) with ESMTP id 356ED9DD17
for <gkj+person@localhost>; Wed, 13 Jul 2005 17:23:16 -0400 (EDT)""",
"Delivered-To":"[email protected]",
"Received":"""from localhost [127.0.0.1]
for <gkj+person@localhost>; Wed, 13 Jul 2005 17:23:16 -0400 (EDT)"""),
("Delivered-To", "[email protected]"),
("Received", """from localhost [127.0.0.1]
by localhost with POP3 (fetchmail-6.2.5)
for gkj+person@localhost (single-drop); Wed, 13 Jul 2005 17:23:16 -0400 (EDT)""",
"Received":"""from andy.gregorykjohnson.com (andy.gregorykjohnson.com [64.32.235.228])
for gkj+person@localhost (single-drop); Wed, 13 Jul 2005 17:23:16 -0400 (EDT)"""),
("Received", """from andy.gregorykjohnson.com (andy.gregorykjohnson.com [64.32.235.228])
by sundance.gregorykjohnson.com (Postfix) with ESMTP id 5B056316746
for <[email protected]>; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)""",
"Received":"""by andy.gregorykjohnson.com (Postfix, from userid 1000)
id 490CD9DD17; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)""",
"Date":"Wed, 13 Jul 2005 17:23:11 -0400",
"From":""""Gregory K. Johnson" <[email protected]>""",
"To":"[email protected]",
"Subject":"Sample message",
"Mime-Version":"1.0",
"Content-Type":"""multipart/mixed; boundary="NMuMz9nt05w80d4+\"""",
"Content-Disposition":"inline",
"User-Agent": "Mutt/1.5.9i" }
for <[email protected]>; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)"""),
("Received", """by andy.gregorykjohnson.com (Postfix, from userid 1000)
id 490CD9DD17; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)"""),
("Date", "Wed, 13 Jul 2005 17:23:11 -0400"),
("From", """"Gregory K. Johnson" <[email protected]>"""),
("To", "[email protected]"),
("Subject", "Sample message"),
("Mime-Version", "1.0"),
("Content-Type", """multipart/mixed; boundary="NMuMz9nt05w80d4+\""""),
("Content-Disposition", "inline"),
("User-Agent", "Mutt/1.5.9i"),
]

_sample_payloads = ("""This is a sample message.

Expand Down