From 188822f9bfc58f6d4b4820d9d0ae6cdaeb738a55 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 25 Jan 2022 18:25:57 +0100 Subject: [PATCH] contract: Improve multi-company tests / don't break former tests structure --- contract/tests/test_contract.py | 4 ++-- contract/tests/test_multicompany.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py index a91470182..353f880a1 100644 --- a/contract/tests/test_contract.py +++ b/contract/tests/test_contract.py @@ -18,7 +18,7 @@ def to_date(date): return fields.Date.to_date(date) -class TestContractBase: +class TestContractBase(common.SavepointCase): @classmethod def setUpClass(cls): super().setUpClass() @@ -170,7 +170,7 @@ class TestContractBase: ) -class TestContract(TestContractBase, common.SavepointCase): +class TestContract(TestContractBase): def _add_template_line(self, overrides=None): if overrides is None: overrides = {} diff --git a/contract/tests/test_multicompany.py b/contract/tests/test_multicompany.py index 07c1ca283..395d5d2e5 100644 --- a/contract/tests/test_multicompany.py +++ b/contract/tests/test_multicompany.py @@ -1,18 +1,19 @@ # Copyright 2021 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.addons.account.tests.common import AccountTestInvoicingCommon from .test_contract import TestContractBase -class ContractMulticompanyCase(TestContractBase, AccountTestInvoicingCommon): +class ContractMulticompanyCase(TestContractBase): @classmethod def setUpClass(cls): super().setUpClass() - + chart_template = cls.env.ref("l10n_generic_coa.configurable_chart_template") cls.company_obj = cls.env["res.company"] cls.company_1 = cls.env.ref("base.main_company") - cls.company_2 = cls.company_data_2["company"] + vals = {"name": "Company 2"} + cls.company_2 = cls.company_obj.create(vals) + chart_template.try_loading(company=cls.company_2) cls.env.user.company_ids |= cls.company_2 cls.contract_mc = (