mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-10 06:48:19 +02:00
Code Activity

Merge branch 'master' into utf8-failing

Browse source
This commit is contained in:
Adam Dobrawy 2017-07-09 04:07:04 +02:00
commit 0449e994d4
13 changed files with 64 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django_mailbox/tests/base.py
View file

@ -171,7 +171,7 @@ class EmailMessageTestCase(TestCase):
)
)
def assertEqual(self, left, right):
def assertEqual(self, left, right): # noqa: N802
if not isinstance(left, email.message.Message):
return super(EmailMessageTestCase, self).assertEqual(left, right)
return self.compare_email_objects(left, right)

10
django_mailbox/tests/test_process_email.py
View file

@ -240,7 +240,7 @@ class TestProcessEmail(EmailMessageTestCase):
success = True
try:
msg = self.mailbox.process_incoming_message(email_object)
self.mailbox.process_incoming_message(email_object)
except ValueError:
success = False
@ -259,7 +259,8 @@ class TestProcessEmail(EmailMessageTestCase):
# this is the code of _process_message()
msg = Message()
# if STORE_ORIGINAL_MESSAGE:
# msg.eml.save('%s.eml' % uuid.uuid4(), ContentFile(message), save=False)
# msg.eml.save('%s.eml' % uuid.uuid4(), ContentFile(message),
# save=False)
msg.mailbox = self.mailbox
if 'subject' in message:
msg.subject = convert_header_to_unicode(message['subject'])[0:255]
@ -273,7 +274,7 @@ class TestProcessEmail(EmailMessageTestCase):
msg.to_header = convert_header_to_unicode(message['Delivered-To'])
msg.save()
#here the message is ok
# here the message is ok
str_msg = message.as_string()
message = self.mailbox._get_dehydrated_message(message, msg)
try:
@ -385,7 +386,8 @@ class TestProcessEmail(EmailMessageTestCase):
self.assertEqual(expected_from, actual_from)
def test_message_reply(self):
email_object = EmailMessage('Test subject', # subject
email_object = EmailMessage(
'Test subject', # subject
'Test body', # body
'username@example.com', # from
['mr.test32@mail.ru'], # to

8
django_mailbox/tests/test_transports.py
View file

@ -59,6 +59,7 @@ class IMAPTestCase(EmailMessageTestCase):
return FAKE_UID_FETCH_SIZES
if arg2 == '(RFC822)':
return FAKE_UID_FETCH_MSG
def imap_server_list_method(pattern=None):
return FAKE_LIST_ARCHIVE_FOLDERS_ANSWERS
@ -88,6 +89,7 @@ class TestImapTransport(IMAPTestCase):
expected_message = self._get_email_object('generic_message.eml')
self.assertEqual(expected_message, actual_message)
class TestImapArchivedTransport(TestImapTransport):
def setUp(self):
super(TestImapArchivedTransport, self).setUp()
@ -100,6 +102,7 @@ class TestImapArchivedTransport(TestImapTransport):
)
self.transport.server = self.imap_server
class TestMaxSizeImapTransport(TestImapTransport):
@override_settings(DJANGO_MAILBOX_MAX_MESSAGE_SIZE=5807)
@ -115,7 +118,9 @@ class TestMaxSizeImapTransport(TestImapTransport):
def test_size_limit(self):
all_message_ids = self.transport._get_all_message_ids()
small_message_ids = self.transport._get_small_message_ids(all_message_ids)
small_message_ids = self.transport._get_small_message_ids(
all_message_ids,
)
self.assertEqual(len(small_message_ids), 1)
def test_get_email_message(self):
@ -163,4 +168,3 @@ class TestPop3Transport(EmailMessageTestCase):
expected_message = self._get_email_object('generic_message.eml')
self.assertEqual(expected_message, actual_message)