diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-03-25 16:47:05 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-03-25 16:47:05 +0100 |
| commit | e9068c290b3ca16e5e2ac9c2e30d824c7a655b62 (patch) | |
| tree | 52a8ac6d3505b3c557b3a47d8620e41939237441 /addons/test_mail/tests/test_mail_gateway.py | |
| parent | 36289e77baa585d2923b95e5145d7169a66f8675 (diff) | |
| parent | 0196a6feb5a15a1e023faa2ffa0865f3338c4e7b (diff) | |
[MERGE] forward port branch 11.0 up to 0196a6feb5a
Diffstat (limited to 'addons/test_mail/tests/test_mail_gateway.py')
| -rw-r--r-- | addons/test_mail/tests/test_mail_gateway.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/test_mail/tests/test_mail_gateway.py b/addons/test_mail/tests/test_mail_gateway.py index 327a0c7f007..b659bda25fb 100644 --- a/addons/test_mail/tests/test_mail_gateway.py +++ b/addons/test_mail/tests/test_mail_gateway.py @@ -499,7 +499,7 @@ class TestMailgateway(BaseFunctionalTest, MockEmails): self.assertEqual(msg.model, False, 'message_post: private discussion: context key "thread_model" not correctly ignored when having no res_id') # Test: message-id - self.assertIn('openerp-private', msg.message_id, 'message_post: private discussion: message-id should contain the private keyword') + self.assertIn('openerp-private', msg.message_id.split('@')[0], 'message_post: private discussion: message-id should contain the private keyword') # Do: Bert replies through mailgateway (is a customer) self.format_and_process( @@ -527,9 +527,9 @@ class TestMailgateway(BaseFunctionalTest, MockEmails): @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models', 'odoo.addons.mail.models.mail_mail') def test_forward_parent_id(self): msg = self.test_record.sudo(self.user_employee).message_post(no_auto_thread=True, subtype='mail.mt_comment') - self.assertNotIn(msg.model, msg.message_id) - self.assertNotIn('-%d-' % msg.res_id, msg.message_id) - self.assertIn('reply_to', msg.message_id) + self.assertNotIn(msg.model, msg.message_id.split('@')[0]) + self.assertNotIn('-%d-' % msg.res_id, msg.message_id.split('@')[0]) + self.assertIn('reply_to', msg.message_id.split('@')[0]) # forward it to a new thread AND an existing thread fw_msg_id = '<THIS.IS.A.FW.MESSAGE.1@bert.fr>' |