ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #172 from plone/mailhost-410

Browse Source 
Fix tests with Products.MailHost 4.10.
This commit is contained in:
Maurits van Rees 2020-09-25 16:41:30 +02:00 committed by GitHub
commit 5ada6a6fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
news/3178.bugfix Normal file
View File

@ -0,0 +1,2 @@
Fix tests with Products.MailHost 4.10.
[maurits]

10
plone/app/discussion/tests/test_notifications.py
View File

@ -65,7 +65,8 @@ class TestUserNotificationUnit(unittest.TestCase):
self.assertEqual(len(self.mailhost.messages), 1) self.assertEqual(len(self.mailhost.messages), 1)
self.assertTrue(self.mailhost.messages[0]) self.assertTrue(self.mailhost.messages[0])
msg = str(self.mailhost.messages[0]) msg = self.mailhost.messages[0]
msg = msg.decode("utf-8")
self.assertTrue('To: john@plone.test' in msg) self.assertTrue('To: john@plone.test' in msg)
self.assertTrue('From: portal@plone.test' in msg) self.assertTrue('From: portal@plone.test' in msg)
# We expect the headers to be properly header encoded (7-bit): # We expect the headers to be properly header encoded (7-bit):
@ -207,6 +208,7 @@ class TestModeratorNotificationUnit(unittest.TestCase):
self.assertEqual(len(self.mailhost.messages), 1) self.assertEqual(len(self.mailhost.messages), 1)
self.assertTrue(self.mailhost.messages[0]) self.assertTrue(self.mailhost.messages[0])
msg = self.mailhost.messages[0] msg = self.mailhost.messages[0]
msg = msg.decode("utf-8")
self.assertTrue('To: portal@plone.test' in msg) self.assertTrue('To: portal@plone.test' in msg)
self.assertTrue('From: portal@plone.test' in msg) self.assertTrue('From: portal@plone.test' in msg)
# We expect the headers to be properly header encoded (7-bit): # We expect the headers to be properly header encoded (7-bit):
@ -244,10 +246,8 @@ class TestModeratorNotificationUnit(unittest.TestCase):
self.assertEqual(len(self.mailhost.messages), 1) self.assertEqual(len(self.mailhost.messages), 1)
msg = self.mailhost.messages[0] msg = self.mailhost.messages[0]
if not isinstance(msg, str): msg = msg.decode("utf-8")
self.assertTrue('test@example.com' in msg.mto) self.assertTrue('To: test@example.com' in msg)
else:
self.assertTrue('To: test@example.com' in msg)
def test_do_not_notify_moderator_when_no_sender_is_available(self): def test_do_not_notify_moderator_when_no_sender_is_available(self):
# Set sender mail address to nonw and make sure no email is send to the # Set sender mail address to nonw and make sure no email is send to the