From 31b2c5925ffadcb6762606eaf68492f7d9be51c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Nov 2020 09:09:23 +0000 Subject: [PATCH] [FIX] test_mail_full: fix overlapping class names It is better to use another naming than re-using class names. Somehow it seems sometimes we have MRO issues. Task ID-2390314 PR odoo/odoo#62384 Signed-off-by: Thibault Delavallee (tde) --- addons/test_mail_full/tests/common.py | 4 ++-- addons/test_mail_full/tests/test_phone_blacklist.py | 4 ++-- addons/test_mail_full/tests/test_sms_composer.py | 4 ++-- addons/test_mail_full/tests/test_sms_management.py | 4 ++-- addons/test_mail_full/tests/test_sms_post.py | 6 +++--- addons/test_mail_full/tests/test_sms_server_actions.py | 4 ++-- addons/test_mail_full/tests/test_sms_template.py | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/test_mail_full/tests/common.py b/addons/test_mail_full/tests/common.py index 02f011b3ec9..53175330018 100644 --- a/addons/test_mail_full/tests/common.py +++ b/addons/test_mail_full/tests/common.py @@ -13,11 +13,11 @@ class TestMailFullCommon(TestMassMailCommon, MassSMSCommon): super(TestMailFullCommon, cls).setUpClass() -class TestRecipients(common.TestRecipients): +class TestMailFullRecipients(common.TestRecipients): @classmethod def setUpClass(cls): - super(TestRecipients, cls).setUpClass() + super(TestMailFullRecipients, cls).setUpClass() cls.partner_numbers = [ phone_validation.phone_format(partner.mobile, partner.country_id.code, partner.country_id.phone_code, force_format='E164') for partner in (cls.partner_1 | cls.partner_2) diff --git a/addons/test_mail_full/tests/test_phone_blacklist.py b/addons/test_mail_full/tests/test_phone_blacklist.py index adf37bdb5c3..799fecee797 100644 --- a/addons/test_mail_full/tests/test_phone_blacklist.py +++ b/addons/test_mail_full/tests/test_phone_blacklist.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestRecipients +from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestMailFullRecipients -class TestPhoneBlacklist(TestMailFullCommon, TestRecipients): +class TestPhoneBlacklist(TestMailFullCommon, TestMailFullRecipients): """ TODO """ @classmethod diff --git a/addons/test_mail_full/tests/test_sms_composer.py b/addons/test_mail_full/tests/test_sms_composer.py index 8a36d0ce2e5..beea3698d9c 100644 --- a/addons/test_mail_full/tests/test_sms_composer.py +++ b/addons/test_mail_full/tests/test_sms_composer.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestRecipients +from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestMailFullRecipients -class TestSMSComposerComment(TestMailFullCommon, TestRecipients): +class TestSMSComposerComment(TestMailFullCommon, TestMailFullRecipients): """ TODO LIST * add test for default_res_model / default_res_id and stuff like that; diff --git a/addons/test_mail_full/tests/test_sms_management.py b/addons/test_mail_full/tests/test_sms_management.py index e0d097971d4..9a745ff5cbd 100644 --- a/addons/test_mail_full/tests/test_sms_management.py +++ b/addons/test_mail_full/tests/test_sms_management.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestRecipients +from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestMailFullRecipients -class TestSMSWizards(TestMailFullCommon, TestRecipients): +class TestSMSWizards(TestMailFullCommon, TestMailFullRecipients): @classmethod def setUpClass(cls): diff --git a/addons/test_mail_full/tests/test_sms_post.py b/addons/test_mail_full/tests/test_sms_post.py index e90c9c10b6b..2a6607f817b 100644 --- a/addons/test_mail_full/tests/test_sms_post.py +++ b/addons/test_mail_full/tests/test_sms_post.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestRecipients +from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestMailFullRecipients -class TestSMSPost(TestMailFullCommon, TestRecipients): +class TestSMSPost(TestMailFullCommon, TestMailFullRecipients): """ TODO * add tests for new mail.message and mail.thread fields; @@ -233,7 +233,7 @@ class TestSMSPost(TestMailFullCommon, TestRecipients): self.assertSMSNotification([{'partner': self.partner_1, 'number': self.test_numbers_san[1]}], 'Dear %s this is an SMS.' % self.test_record.display_name, messages) -class TestSMSPostException(TestMailFullCommon, TestRecipients): +class TestSMSPostException(TestMailFullCommon, TestMailFullRecipients): @classmethod def setUpClass(cls): diff --git a/addons/test_mail_full/tests/test_sms_server_actions.py b/addons/test_mail_full/tests/test_sms_server_actions.py index 869a61c48a0..a8001265942 100644 --- a/addons/test_mail_full/tests/test_sms_server_actions.py +++ b/addons/test_mail_full/tests/test_sms_server_actions.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestRecipients +from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestMailFullRecipients -class TestServerAction(TestMailFullCommon, TestRecipients): +class TestServerAction(TestMailFullCommon, TestMailFullRecipients): @classmethod def setUpClass(cls): diff --git a/addons/test_mail_full/tests/test_sms_template.py b/addons/test_mail_full/tests/test_sms_template.py index c57ae3cfefb..abc22fcf269 100644 --- a/addons/test_mail_full/tests/test_sms_template.py +++ b/addons/test_mail_full/tests/test_sms_template.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestRecipients +from odoo.addons.test_mail_full.tests.common import TestMailFullCommon, TestMailFullRecipients -class TestSmsTemplate(TestMailFullCommon, TestRecipients): +class TestSmsTemplate(TestMailFullCommon, TestMailFullRecipients): @classmethod def setUpClass(cls):