diff --git a/news/3178.bugfix b/news/3178.bugfix new file mode 100644 index 0000000..c62697d --- /dev/null +++ b/news/3178.bugfix @@ -0,0 +1,2 @@ +Fix tests with Products.MailHost 4.10. +[maurits] diff --git a/plone/app/discussion/tests/test_notifications.py b/plone/app/discussion/tests/test_notifications.py index 16844e2..9ed3492 100644 --- a/plone/app/discussion/tests/test_notifications.py +++ b/plone/app/discussion/tests/test_notifications.py @@ -65,7 +65,8 @@ class TestUserNotificationUnit(unittest.TestCase): self.assertEqual(len(self.mailhost.messages), 1) 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('From: portal@plone.test' in msg) # 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.assertTrue(self.mailhost.messages[0]) msg = self.mailhost.messages[0] + msg = msg.decode("utf-8") self.assertTrue('To: portal@plone.test' in msg) self.assertTrue('From: portal@plone.test' in msg) # 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) msg = self.mailhost.messages[0] - if not isinstance(msg, str): - self.assertTrue('test@example.com' in msg.mto) - else: - self.assertTrue('To: test@example.com' in msg) + msg = msg.decode("utf-8") + self.assertTrue('To: test@example.com' in msg) 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