Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4680919

Browse files
akheronakheron
committed
#15222: test_mailbox: End message template in a newline
1 parent 1654d74 commit 4680919

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

‎Lib/test/test_mailbox.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TestMailbox(TestBase):
4949
maxDiff = None
5050

5151
_factory = None # Overridden by subclasses to reuse tests
52-
_template = 'From: foo\n\n%s'
52+
_template = 'From: foo\n\n%s\n'
5353

5454
def setUp(self):
5555
self._path = support.TESTFN
@@ -228,22 +228,22 @@ def test_get(self):
228228
key0 = self._box.add(self._template % 0)
229229
msg = self._box.get(key0)
230230
self.assertEqual(msg['from'], 'foo')
231-
self.assertEqual(msg.get_payload(), '0')
231+
self.assertEqual(msg.get_payload(), '0\n')
232232
self.assertIs(self._box.get('foo'), None)
233233
self.assertIs(self._box.get('foo', False), False)
234234
self._box.close()
235235
self._box = self._factory(self._path)
236236
key1 = self._box.add(self._template % 1)
237237
msg = self._box.get(key1)
238238
self.assertEqual(msg['from'], 'foo')
239-
self.assertEqual(msg.get_payload(), '1')
239+
self.assertEqual(msg.get_payload(), '1\n')
240240

241241
def test_getitem(self):
242242
# Retrieve message using __getitem__()
243243
key0 = self._box.add(self._template % 0)
244244
msg = self._box[key0]
245245
self.assertEqual(msg['from'], 'foo')
246-
self.assertEqual(msg.get_payload(), '0')
246+
self.assertEqual(msg.get_payload(), '0\n')
247247
self.assertRaises(KeyError, lambda: self._box['foo'])
248248
self._box.discard(key0)
249249
self.assertRaises(KeyError, lambda: self._box[key0])
@@ -255,7 +255,7 @@ def test_get_message(self):
255255
msg0 = self._box.get_message(key0)
256256
self.assertIsInstance(msg0, mailbox.Message)
257257
self.assertEqual(msg0['from'], 'foo')
258-
self.assertEqual(msg0.get_payload(), '0')
258+
self.assertEqual(msg0.get_payload(), '0\n')
259259
self._check_sample(self._box.get_message(key1))
260260

261261
def test_get_bytes(self):
@@ -428,15 +428,15 @@ def test_pop(self):
428428
self.assertIn(key0, self._box)
429429
key1 = self._box.add(self._template % 1)
430430
self.assertIn(key1, self._box)
431-
self.assertEqual(self._box.pop(key0).get_payload(), '0')
431+
self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
432432
self.assertNotIn(key0, self._box)
433433
self.assertIn(key1, self._box)
434434
key2 = self._box.add(self._template % 2)
435435
self.assertIn(key2, self._box)
436-
self.assertEqual(self._box.pop(key2).get_payload(), '2')
436+
self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
437437
self.assertNotIn(key2, self._box)
438438
self.assertIn(key1, self._box)
439-
self.assertEqual(self._box.pop(key1).get_payload(), '1')
439+
self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
440440
self.assertNotIn(key1, self._box)
441441
self.assertEqual(len(self._box), 0)
442442

@@ -631,15 +631,15 @@ def test_set_MM(self):
631631
msg_returned = self._box.get_message(key)
632632
self.assertEqual(msg_returned.get_subdir(), 'new')
633633
self.assertEqual(msg_returned.get_flags(), '')
634-
self.assertEqual(msg_returned.get_payload(), '1')
634+
self.assertEqual(msg_returned.get_payload(), '1\n')
635635
msg2 = mailbox.MaildirMessage(self._template % 2)
636636
msg2.set_info('2,S')
637637
self._box[key] = msg2
638638
self._box[key] = self._template % 3
639639
msg_returned = self._box.get_message(key)
640640
self.assertEqual(msg_returned.get_subdir(), 'new')
641641
self.assertEqual(msg_returned.get_flags(), 'S')
642-
self.assertEqual(msg_returned.get_payload(), '3')
642+
self.assertEqual(msg_returned.get_payload(), '3\n')
643643

644644
def test_consistent_factory(self):
645645
# Add a message.
@@ -993,20 +993,20 @@ def assertMailboxEmpty(self):
993993

994994
def test_add_from_string(self):
995995
# Add a string starting with 'From ' to the mailbox
996-
key = self._box.add('From foo@bar blah\nFrom: foo\n\n0')
996+
key = self._box.add('From foo@bar blah\nFrom: foo\n\n0\n')
997997
self.assertEqual(self._box[key].get_from(), 'foo@bar blah')
998-
self.assertEqual(self._box[key].get_payload(), '0')
998+
self.assertEqual(self._box[key].get_payload(), '0\n')
999999

10001000
def test_add_from_bytes(self):
10011001
# Add a byte string starting with 'From ' to the mailbox
1002-
key = self._box.add(b'From foo@bar blah\nFrom: foo\n\n0')
1002+
key = self._box.add(b'From foo@bar blah\nFrom: foo\n\n0\n')
10031003
self.assertEqual(self._box[key].get_from(), 'foo@bar blah')
1004-
self.assertEqual(self._box[key].get_payload(), '0')
1004+
self.assertEqual(self._box[key].get_payload(), '0\n')
10051005

10061006
def test_add_mbox_or_mmdf_message(self):
10071007
# Add an mboxMessage or MMDFMessage
10081008
for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
1009-
msg = class_('From foo@bar blah\nFrom: foo\n\n0')
1009+
msg = class_('From foo@bar blah\nFrom: foo\n\n0\n')
10101010
key = self._box.add(msg)
10111011

10121012
def test_open_close_open(self):

0 commit comments

Comments
 (0)