From 484148e8e4040830a4eebf0949100c1cc2a4a011 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 14 Jun 2013 13:42:58 +0200 Subject: [PATCH] [FIX] mail: compare splitted email in tests bzr revid: chs@openerp.com-20130614114258-iar6h3ctaaqrb4on --- addons/mail/tests/test_mail_features.py | 4 ++-- addons/mail/tests/test_mail_gateway.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py index 46f4555349d..ca9c156c8cb 100644 --- a/addons/mail/tests/test_mail_features.py +++ b/addons/mail/tests/test_mail_features.py @@ -22,7 +22,7 @@ from openerp.addons.mail.mail_mail import mail_mail from openerp.addons.mail.mail_thread import mail_thread from openerp.addons.mail.tests.test_mail_base import TestMailBase -from openerp.tools import mute_logger +from openerp.tools import mute_logger, email_split from openerp.tools.mail import html_sanitize @@ -479,7 +479,7 @@ class test_mail(TestMailBase): 'message_post: notification email sent to more than one email address instead of a precise partner') self.assertIn(sent_email['email_to'][0], test_emailto, 'message_post: notification email email_to incorrect') - self.assertEqual(sent_email['reply_to'], 'r@r', # was '"Followers of Pigs" ', but makes no sense + self.assertEqual(email_split(sent_email['reply_to']), ['r@r'], # was '"Followers of Pigs" ', but makes no sense 'message_post: notification email reply_to incorrect: should have raoul email') self.assertEqual(_mail_subject, sent_email['subject'], 'message_post: notification email subject incorrect') diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py index 01e4dd2c9cb..9e05bb049c1 100644 --- a/addons/mail/tests/test_mail_gateway.py +++ b/addons/mail/tests/test_mail_gateway.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.addons.mail.tests.test_mail_base import TestMailBase -from openerp.tools import mute_logger +from openerp.tools import mute_logger, email_split MAIL_TEMPLATE = """Return-Path: To: {to} @@ -274,7 +274,7 @@ class TestMailgateway(TestMailBase): mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'}) mail = self.mail_mail.browse(cr, uid, mail_id) # Test: mail_mail content - self.assertEqual(mail.reply_to, msg.email_from, + self.assertEqual(email_split(mail.reply_to), email_split(msg.email_from), 'mail_mail: reply_to should be equal to mail_message.email_from when having no document or default alias') # Data: set catchall domain