From 439ebff0f5c8fb70cde680126fcf0109e1f38bf6 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 30 Sep 2019 11:32:10 +0000 Subject: [PATCH] [FIX] test_mail: wrong way to check many2many values --- addons/test_mail/tests/test_performance.py | 90 ++++++++++++---------- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index 919d6ac9dd7..861d0c1bcea 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -412,9 +412,10 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'customer_id': False, 'user_id': self.user_portal.id, }) + rec1 = rec.with_context(active_test=False) # to see inactive records - self.assertEqual(rec.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id) - self.assertEqual(rec.message_channel_ids, self.env['mail.channel']) + self.assertEqual(rec1.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id) + self.assertEqual(rec1.message_channel_ids, self.env['mail.channel']) # subscribe new followers with forced given subtypes with self.assertQueryCount(__system__=8, emp=8): @@ -424,8 +425,8 @@ class TestHeavyMailPerformance(BaseMailPerformance): subtype_ids=subtype_ids ) - self.assertEqual(rec.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id | self.partners[:4]) - self.assertEqual(rec.message_channel_ids, self.channel) + self.assertEqual(rec1.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id | self.partners[:4]) + self.assertEqual(rec1.message_channel_ids, self.channel) # subscribe existing and new followers with force=False, meaning only some new followers will be added with self.assertQueryCount(__system__=6, emp=6): @@ -435,8 +436,8 @@ class TestHeavyMailPerformance(BaseMailPerformance): subtype_ids=None ) - self.assertEqual(rec.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id | self.partners[:6]) - self.assertEqual(rec.message_channel_ids, self.channel) + self.assertEqual(rec1.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id | self.partners[:6]) + self.assertEqual(rec1.message_channel_ids, self.channel) # subscribe existing and new followers with force=True, meaning all will have the same subtypes with self.assertQueryCount(__system__=7, emp=7): @@ -446,8 +447,8 @@ class TestHeavyMailPerformance(BaseMailPerformance): subtype_ids=subtype_ids ) - self.assertEqual(rec.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id | self.partners) - self.assertEqual(rec.message_channel_ids, self.channel) + self.assertEqual(rec1.message_partner_ids, self.env.user.partner_id | self.user_portal.partner_id | self.partners) + self.assertEqual(rec1.message_channel_ids, self.channel) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @users('__system__', 'emp') @@ -460,17 +461,18 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'customer_id': self.customer.id, 'user_id': self.env.uid, }) - self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id) + rec1 = rec.with_context(active_test=False) # to see inactive records + self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id) with self.assertQueryCount(__system__=39, emp=40): rec.write({'user_id': self.user_portal.id}) - self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) + self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # write tracking message - self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('mail.mt_note')) - self.assertEqual(rec.message_ids[0].notified_partner_ids, self.env['res.partner']) + self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('mail.mt_note')) + self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.env['res.partner']) # creation message - self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[1].notified_partner_ids, self.partners) - self.assertEqual(len(rec.message_ids), 2) + self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) + self.assertEqual(rec1.message_ids[1].notified_partner_ids, self.partners) + self.assertEqual(len(rec1.message_ids), 2) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @users('__system__', 'emp') @@ -489,11 +491,12 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'user_id': user_id, }) - self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) + rec1 = rec.with_context(active_test=False) # to see inactive records + self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # creation message - self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) - self.assertEqual(len(rec.message_ids), 1) + self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) + self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(len(rec1.message_ids), 1) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @users('__system__', 'emp') @@ -506,22 +509,23 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'customer_id': False, 'user_id': self.user_portal.id, }) - self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id) - self.assertEqual(len(rec.message_ids), 1) + rec1 = rec.with_context(active_test=False) # to see inactive records + self.assertEqual(rec1.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id) + self.assertEqual(len(rec1.message_ids), 1) with self.assertQueryCount(__system__=84, emp=85): rec.write({ 'name': 'Test2', 'umbrella_id': self.umbrella.id, }) - self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) + self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # write tracking message - self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) + self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) # creation message - self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('mail.mt_note')) - self.assertEqual(rec.message_ids[1].notified_partner_ids, self.env['res.partner']) - self.assertEqual(len(rec.message_ids), 2) + self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('mail.mt_note')) + self.assertEqual(rec1.message_ids[1].notified_partner_ids, self.env['res.partner']) + self.assertEqual(len(rec1.message_ids), 2) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @users('__system__', 'emp') @@ -542,7 +546,8 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'customer_id': False, 'user_id': self.user_portal.id, }) - self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id) + rec1 = rec.with_context(active_test=False) # to see inactive records + self.assertEqual(rec1.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id) with self.assertQueryCount(__system__=92, emp=93): rec.write({ @@ -551,14 +556,14 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'customer_id': customer_id, }) - self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) + self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # write tracking message - self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) + self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) # creation message - self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[1].notified_partner_ids, self.user_portal.partner_id) - self.assertEqual(len(rec.message_ids), 2) + self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) + self.assertEqual(rec1.message_ids[1].notified_partner_ids, self.user_portal.partner_id) + self.assertEqual(len(rec1.message_ids), 2) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @users('__system__', 'emp') @@ -574,7 +579,8 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'user_id': self.user_portal.id, 'mail_template': self.env.ref('test_mail.mail_test_full_tracking_tpl').id, }) - self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) + rec1 = rec.with_context(active_test=False) # to see inactive records + self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) with self.assertQueryCount(__system__=33, emp=35): rec.write({ @@ -584,15 +590,15 @@ class TestHeavyMailPerformance(BaseMailPerformance): }) # write template message (sent to customer, mass mailing kept for history) - self.assertEqual(rec.message_ids[0].subtype_id, self.env['mail.message.subtype']) - self.assertEqual(rec.message_ids[0].subject, 'Test Template') + self.assertEqual(rec1.message_ids[0].subtype_id, self.env['mail.message.subtype']) + self.assertEqual(rec1.message_ids[0].subject, 'Test Template') # write tracking message - self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('mail.mt_note')) - self.assertEqual(rec.message_ids[1].notified_partner_ids, self.env['res.partner']) + self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('mail.mt_note')) + self.assertEqual(rec1.message_ids[1].notified_partner_ids, self.env['res.partner']) # creation message - self.assertEqual(rec.message_ids[2].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[2].notified_partner_ids, self.partners | self.user_portal.partner_id) - self.assertEqual(len(rec.message_ids), 3) + self.assertEqual(rec1.message_ids[2].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) + self.assertEqual(rec1.message_ids[2].notified_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(len(rec1.message_ids), 3) @tagged('mail_performance')