Xavier Morel
864d991c7e
Followup to #82105: turns out we kind-of forgot that records could be updated with new attachment and the exact same issue could occur. So with the same reasoning as the previous PR, re-attach attachments to the current object when updating it. closes odoo/odoo#83083 X-original-commit: 398070ec1b6ed7d6a8e7c0ab75d45b8a9ad0e0d0 Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
109 lines
4.4 KiB
Python
109 lines
4.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo.addons.mail.tests.common import mail_new_test_user
|
|
from odoo.tests.common import TransactionCase, users, warmup
|
|
from odoo.tests import tagged
|
|
from odoo.tools import mute_logger
|
|
|
|
|
|
class TestMassMailPerformanceBase(TransactionCase):
|
|
|
|
def setUp(self):
|
|
super(TestMassMailPerformanceBase, self).setUp()
|
|
|
|
self.user_employee = mail_new_test_user(
|
|
self.env, login='emp',
|
|
groups='base.group_user',
|
|
name='Ernest Employee', notification_type='inbox')
|
|
|
|
self.user_marketing = mail_new_test_user(
|
|
self.env, login='marketing',
|
|
groups='base.group_user,mass_mailing.group_mass_mailing_user',
|
|
name='Martial Marketing', signature='--\nMartial')
|
|
|
|
# setup mail gateway
|
|
self.alias_domain = 'example.com'
|
|
self.alias_catchall = 'catchall.test'
|
|
self.alias_bounce = 'bounce.test'
|
|
self.default_from = 'notifications'
|
|
self.env['ir.config_parameter'].set_param('mail.bounce.alias', self.alias_bounce)
|
|
self.env['ir.config_parameter'].set_param('mail.catchall.domain', self.alias_domain)
|
|
self.env['ir.config_parameter'].set_param('mail.catchall.alias', self.alias_catchall)
|
|
self.env['ir.config_parameter'].set_param('mail.default.from', self.default_from)
|
|
|
|
# patch registry to simulate a ready environment
|
|
self.patch(self.env.registry, 'ready', True)
|
|
|
|
|
|
@tagged('mail_performance')
|
|
class TestMassMailPerformance(TestMassMailPerformanceBase):
|
|
|
|
def setUp(self):
|
|
super(TestMassMailPerformance, self).setUp()
|
|
values = [{
|
|
'name': 'Recipient %s' % x,
|
|
'email_from': 'Recipient <rec.%s@example.com>' % x,
|
|
} for x in range(0, 50)]
|
|
self.mm_recs = self.env['mailing.performance'].create(values)
|
|
|
|
@users('__system__', 'marketing')
|
|
@warmup
|
|
@mute_logger('odoo.addons.mail.models.mail_mail', 'odoo.models.unlink', 'odoo.tests')
|
|
def test_send_mailing(self):
|
|
mailing = self.env['mailing.mailing'].create({
|
|
'name': 'Test',
|
|
'subject': 'Test',
|
|
'body_html': '<p>Hello <a role="button" href="https://www.example.com/foo/bar?baz=qux">quux</a><a role="button" href="/unsubscribe_from_list">Unsubscribe</a></p>',
|
|
'reply_to_mode': 'new',
|
|
'mailing_model_id': self.ref('test_mass_mailing.model_mailing_performance'),
|
|
'mailing_domain': [('id', 'in', self.mm_recs.ids)],
|
|
})
|
|
|
|
# runbot needs +101 compared to local (1568)
|
|
with self.assertQueryCount(__system__=1670, marketing=1671):
|
|
mailing.action_send_mail()
|
|
|
|
self.assertEqual(mailing.sent, 50)
|
|
self.assertEqual(mailing.delivered, 50)
|
|
|
|
|
|
@tagged('mail_performance')
|
|
class TestMassMailBlPerformance(TestMassMailPerformanceBase):
|
|
|
|
def setUp(self):
|
|
""" In this setup we prepare 20 blacklist entries. We therefore add
|
|
20 recipients compared to first test in order to have comparable results. """
|
|
super(TestMassMailBlPerformance, self).setUp()
|
|
values = [{
|
|
'name': 'Recipient %s' % x,
|
|
'email_from': 'Recipient <rec.%s@example.com>' % x,
|
|
} for x in range(0, 62)]
|
|
self.mm_recs = self.env['mailing.performance.blacklist'].create(values)
|
|
|
|
for x in range(1, 13):
|
|
self.env['mail.blacklist'].create({
|
|
'email': 'rec.%s@example.com' % (x * 5)
|
|
})
|
|
self.env['mailing.performance.blacklist'].flush()
|
|
|
|
@users('__system__', 'marketing')
|
|
@warmup
|
|
@mute_logger('odoo.addons.mail.models.mail_mail', 'odoo.models.unlink', 'odoo.tests')
|
|
def test_send_mailing_w_bl(self):
|
|
mailing = self.env['mailing.mailing'].create({
|
|
'name': 'Test',
|
|
'subject': 'Test',
|
|
'body_html': '<p>Hello <a role="button" href="https://www.example.com/foo/bar?baz=qux">quux</a><a role="button" href="/unsubscribe_from_list">Unsubscribe</a></p>',
|
|
'reply_to_mode': 'new',
|
|
'mailing_model_id': self.ref('test_mass_mailing.model_mailing_performance_blacklist'),
|
|
'mailing_domain': [('id', 'in', self.mm_recs.ids)],
|
|
})
|
|
|
|
# runbot needs +125 compared to local (1834)
|
|
with self.assertQueryCount(__system__=1960, marketing=1961):
|
|
mailing.action_send_mail()
|
|
|
|
self.assertEqual(mailing.sent, 50)
|
|
self.assertEqual(mailing.delivered, 50)
|