diff options
| author | Thibault Delavallée <tde@odoo.com> | 2020-01-31 15:47:29 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-03-20 14:58:44 +0000 |
| commit | fd9b2590261e6caf4a8952d17db6e1ca06778140 (patch) | |
| tree | daaf9ab9c333149731b5c109ef3737f16ac2e6d9 /addons/test_mass_mailing | |
| parent | 5353fb249609e89485a63d06d4f2088b6a9d307d (diff) | |
[REF] mail: merge blacklist and address mixins
PURPOSE
Perform some code cleaning in mail module
SPECIFICATIONS
mail.address.mixin is used only for mail.thread.blacklist mixin. Let us
merge those two and simplify class organization.
LINKS
Task ID 2222033
closes odoo/odoo#48115
Related: odoo/upgrade#967
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Diffstat (limited to 'addons/test_mass_mailing')
| -rw-r--r-- | addons/test_mass_mailing/models/mass_mail_test.py | 2 | ||||
| -rw-r--r-- | addons/test_mass_mailing/tests/test_performance.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/test_mass_mailing/models/mass_mail_test.py b/addons/test_mass_mailing/models/mass_mail_test.py index 3da40c424ce..d4772433748 100644 --- a/addons/test_mass_mailing/models/mass_mail_test.py +++ b/addons/test_mass_mailing/models/mass_mail_test.py @@ -9,7 +9,7 @@ class MassMailTest(models.Model): mailing features and base performances. """ _description = 'Simple Mass Mailing Model' _name = 'mass.mail.test' - _inherit = ['mail.thread', 'mail.address.mixin'] + _inherit = ['mail.thread.blacklist'] _primary_email = 'email_from' name = fields.Char() diff --git a/addons/test_mass_mailing/tests/test_performance.py b/addons/test_mass_mailing/tests/test_performance.py index d1791ecb1bb..276b2701731 100644 --- a/addons/test_mass_mailing/tests/test_performance.py +++ b/addons/test_mass_mailing/tests/test_performance.py @@ -51,7 +51,7 @@ class TestMassMailPerformance(TestMassMailPerformanceBase): }) # runbot needs +50 compared to local - with self.assertQueryCount(__system__=1912, marketing=1913): + with self.assertQueryCount(__system__=1915, marketing=1916): mailing.action_send_mail() self.assertEqual(mailing.sent, 50) |