languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 17:59:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
AGZain 2023-04-06 18:19:11 -04:00 committed by GitHub
parent 5d08c3ff7d
commit a653c32d08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Lib/test/test_mailbox.py
View file

@ -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))
@ -2264,30 +2264,31 @@ def test_nonempty_maildir_both(self):
_bytes_sample_message = _sample_message.encode('ascii')
_sample_headers = {
"Return-Path":"<gkj@gregorykjohnson.com>",
"X-Original-To":"gkj+person@localhost",
"Delivered-To":"gkj+person@localhost",
"Received":"""from localhost (localhost [127.0.0.1])
_sample_headers = [
("Return-Path", "<gkj@gregorykjohnson.com>"),
("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":"gkj@sundance.gregorykjohnson.com",
"Received":"""from localhost [127.0.0.1]
for <gkj+person@localhost>; Wed, 13 Jul 2005 17:23:16 -0400 (EDT)"""),
("Delivered-To", "gkj@sundance.gregorykjohnson.com"),
("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 <gkj@gregorykjohnson.com>; 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" <gkj@gregorykjohnson.com>""",
"To":"gkj@gregorykjohnson.com",
"Subject":"Sample message",
"Mime-Version":"1.0",
"Content-Type":"""multipart/mixed; boundary="NMuMz9nt05w80d4+\"""",
"Content-Disposition":"inline",
"User-Agent": "Mutt/1.5.9i" }
for <gkj@gregorykjohnson.com>; 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" <gkj@gregorykjohnson.com>"""),
("To", "gkj@gregorykjohnson.com"),
("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.