[MERGE] forward port branch saas-12.1 up to 8aa8548d8ab

2 files changed, 7 insertions, 7 deletions

diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index a73af0bcb6e..4d90a1945e9 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -265,7 +265,7 @@ class TestAdvMailPerformance(TransactionCase):
     def test_message_post_one_email_notification(self):
         record = self.env['mail.test.simple'].create({'name': 'Test'})
 
-        with self.assertQueryCount(__system__=50, emp=70):  # com runbot: 47 - 67 // test_mail only: 50 - 67
+        with self.assertQueryCount(__system__=51, emp=71):  # com runbot: 51 - 71 // test_mail only: 48 - 68
             record.message_post(
                 body='<p>Test Post Performances with an email ping</p>',
                 partner_ids=self.customer.ids,
@@ -401,7 +401,7 @@ class TestHeavyMailPerformance(TransactionCase):
         self.umbrella.message_subscribe(self.user_portal.partner_id.ids)
         record = self.umbrella.sudo(self.env.user)
 
-        with self.assertQueryCount(__system__=84, emp=107):  # com runbot 81 - 104 // test_mail only: 84 - 104
+        with self.assertQueryCount(__system__=85, emp=108):  # com runbot: 85 - 108 // test_mail only: 81 - 105
             record.message_post(
                 body='<p>Test Post Performances</p>',
                 message_type='comment',
@@ -418,7 +418,7 @@ class TestHeavyMailPerformance(TransactionCase):
         record = self.umbrella.sudo(self.env.user)
         template_id = self.env.ref('test_mail.mail_test_tpl').id
 
-        with self.assertQueryCount(__system__=103, emp=138):  # com runbot 100 - 135 // test_mail only: 103 - 135
+        with self.assertQueryCount(__system__=104, emp=139):  # com runbot: 104 - 139 // test_mail only: 101 - 136
             record.message_post_with_template(template_id, message_type='comment', composition_mode='comment')
 
         self.assertEqual(record.message_ids[0].body, '<p>Adding stuff on %s</p>' % record.name)
@@ -488,7 +488,7 @@ class TestHeavyMailPerformance(TransactionCase):
         })
         self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id)
 
-        with self.assertQueryCount(__system__=60, emp=75):  # com runbot: 60 - 75 // test_mail only: 60 - 72
+        with self.assertQueryCount(__system__=61, emp=76):  # com runbot: 61 - 76 // test_mail only: 60 - 72
             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)
@@ -540,7 +540,7 @@ class TestHeavyMailPerformance(TransactionCase):
         })
         self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
 
-        with self.assertQueryCount(__system__=98, emp=119):  # com runbot: 98 - 119 // test_mail only: 98 - 116
+        with self.assertQueryCount(__system__=99, emp=120):  # com runbot: 99 - 120 // test_mail only: 98 - 116
             rec.write({
                 'name': 'Test2',
                 'umbrella_id': self.umbrella.id,
@@ -578,7 +578,7 @@ class TestHeavyMailPerformance(TransactionCase):
         })
         self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
 
-        with self.assertQueryCount(__system__=104, emp=125):  # test_mail only: 104 - 122
+        with self.assertQueryCount(__system__=105, emp=126):  # test_mail only: 105 - 122
             rec.write({
                 'name': 'Test2',
                 'umbrella_id': umbrella_id,
diff --git a/addons/test_mail/tests/test_ui.py b/addons/test_mail/tests/test_ui.py
index f3f38d8a8c4..59f6dc37047 100644
--- a/addons/test_mail/tests/test_ui.py
+++ b/addons/test_mail/tests/test_ui.py
@@ -6,5 +6,5 @@ import odoo.tests
 @odoo.tests.tagged('post_install', '-at_install')
 class TestUi(odoo.tests.HttpCase):
 
-    def test_01_project_tour(self):
+    def test_01_mail_tour(self):
         self.phantom_js("/web", "odoo.__DEBUG__.services['web_tour.tour'].run('mail_tour')", "odoo.__DEBUG__.services['web_tour.tour'].tours.mail_tour.ready", login="admin")