From 439ebff0f5c8fb70cde680126fcf0109e1f38bf6 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 30 Sep 2019 11:32:10 +0000 Subject: [FIX] test_mail: wrong way to check many2many values --- addons/test_mail/tests/test_performance.py | 90 ++++++++++++++++-------------- 1 file changed, 48 insertions(+), 42 deletions(-) (limited to 'addons/test_mail/tests/test_performance.py') 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') -- cgit v1.2.3 From 338997d7a1854050cbcc176a224ca2c89e863b89 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 30 Sep 2019 11:32:47 +0000 Subject: [FIX] test_mail: adapt query counts closes odoo/odoo#37577 Signed-off-by: Raphael Collet (rco) --- addons/test_mail/tests/test_performance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/test_mail/tests/test_performance.py') diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index 861d0c1bcea..3c5de0a5986 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -392,7 +392,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): record = self.umbrella.with_user(self.env.user) template_id = self.env.ref('test_mail.mail_test_tpl').id - with self.assertQueryCount(__system__=81, emp=82): + with self.assertQueryCount(__system__=82, emp=83): record.message_post_with_template(template_id, message_type='comment', composition_mode='comment') self.assertEqual(record.message_ids[0].body, '

Adding stuff on %s

' % record.name) -- cgit v1.2.3 From 2b830e5d41163e12de2fd493d21eba24daf8f924 Mon Sep 17 00:00:00 2001 From: fw-bot Date: Mon, 7 Oct 2019 19:57:00 +0000 Subject: [FIX] mail: translate assignation msg in recipient lang Before this commit, when assigning a user onto a record, through the field user_id, the email was sent in the current user's language After this commit, it is sent in the partner's language OPW 2060898 closes odoo/odoo#38142 Signed-off-by: Lucas Perais (lpe) --- addons/test_mail/tests/test_performance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/test_mail/tests/test_performance.py') diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index 3c5de0a5986..64faed185b2 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -200,7 +200,7 @@ class TestAdvMailPerformance(BaseMailPerformance): def test_message_assignation_email(self): self.user_test.write({'notification_type': 'email'}) record = self.env['mail.test.track'].create({'name': 'Test'}) - with self.assertQueryCount(__system__=39, emp=40): + with self.assertQueryCount(__system__=40, emp=41): record.write({ 'user_id': self.user_test.id, }) -- cgit v1.2.3 From f064437f0671f346a802eb7c045ded8a1e9a2d23 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 4 Oct 2019 09:32:38 +0000 Subject: [FIX] test_mail: query counts closes odoo/odoo#38034 Signed-off-by: Raphael Collet (rco) --- addons/test_mail/tests/test_performance.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'addons/test_mail/tests/test_performance.py') diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index 64faed185b2..541f2d4ebf8 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -253,7 +253,7 @@ class TestAdvMailPerformance(BaseMailPerformance): def test_message_post_one_email_notification(self): record = self.env['mail.test.simple'].create({'name': 'Test'}) - with self.assertQueryCount(__system__=32, emp=33): + with self.assertQueryCount(__system__=33, emp=34): record.message_post( body='

Test Post Performances with an email ping

', partner_ids=self.customer.ids, @@ -362,7 +362,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): 'recipient_ids': [(4, pid) for pid in self.partners.ids], }) mail_ids = mail.ids - with self.assertQueryCount(__system__=7, emp=7): + with self.assertQueryCount(__system__=8, emp=9): self.env['mail.mail'].browse(mail_ids).send() self.assertEqual(mail.body_html, '

Test

') @@ -375,7 +375,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): self.umbrella.message_subscribe(self.user_portal.partner_id.ids) record = self.umbrella.with_user(self.env.user) - with self.assertQueryCount(__system__=71, emp=72): + with self.assertQueryCount(__system__=73, emp=74): record.message_post( body='

Test Post Performances

', message_type='comment', @@ -392,7 +392,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): record = self.umbrella.with_user(self.env.user) template_id = self.env.ref('test_mail.mail_test_tpl').id - with self.assertQueryCount(__system__=82, emp=83): + with self.assertQueryCount(__system__=84, emp=85): record.message_post_with_template(template_id, message_type='comment', composition_mode='comment') self.assertEqual(record.message_ids[0].body, '

Adding stuff on %s

' % record.name) @@ -483,7 +483,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): customer_id = self.customer.id user_id = self.user_portal.id - with self.assertQueryCount(__system__=121, emp=122): + with self.assertQueryCount(__system__=123, emp=124): rec = self.env['mail.test.full'].create({ 'name': 'Test', 'umbrella_id': umbrella_id, @@ -512,7 +512,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): 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): + with self.assertQueryCount(__system__=86, emp=87): rec.write({ 'name': 'Test2', 'umbrella_id': self.umbrella.id, @@ -549,7 +549,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): 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): + with self.assertQueryCount(__system__=94, emp=95): rec.write({ 'name': 'Test2', 'umbrella_id': umbrella_id, @@ -582,7 +582,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): 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): + with self.assertQueryCount(__system__=34, emp=37): rec.write({ 'name': 'Test2', 'customer_id': customer_id, -- cgit v1.2.3