From a4c8c01f21dcc14b8cd428132d78e3b07de2bd04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 26 Aug 2016 09:59:40 +0200 Subject: [PATCH] Use install_modules tools in scenario issue5794 --- tests/scenario_sale_invoice_grouping.rst | 21 +++++---------------- tests/test_sale_invoice_grouping.py | 4 ++-- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/scenario_sale_invoice_grouping.rst b/tests/scenario_sale_invoice_grouping.rst index ee89562919..28398ac892 100644 --- a/tests/scenario_sale_invoice_grouping.rst +++ b/tests/scenario_sale_invoice_grouping.rst @@ -8,7 +8,8 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter - >>> from proteus import config, Model, Wizard + >>> from proteus import Model, Wizard + >>> from trytond.tests.tools import install_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -17,31 +18,19 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> today = datetime.date.today() -Create database:: +Install sale_invoice_grouping:: - >>> config = config.set_trytond() - >>> config.pool.test = True - -Install sale:: - - >>> Module = Model.get('ir.module') - >>> sale_module, = Module.find([('name', '=', 'sale_invoice_grouping')]) - >>> sale_module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('sale_invoice_grouping') Create company:: >>> _ = create_company() >>> company = get_company() -Reload the context:: +Create sale user:: >>> User = Model.get('res.user') >>> Group = Model.get('res.group') - >>> config._context = User.get_preferences(True, config.context) - -Create sale user:: - >>> sale_user = User() >>> sale_user.name = 'Sale' >>> sale_user.login = 'sale' diff --git a/tests/test_sale_invoice_grouping.py b/tests/test_sale_invoice_grouping.py index 97a15514e3..4de41b64a0 100644 --- a/tests/test_sale_invoice_grouping.py +++ b/tests/test_sale_invoice_grouping.py @@ -4,7 +4,7 @@ import unittest import doctest import trytond.tests.test_tryton from trytond.tests.test_tryton import ModuleTestCase -from trytond.tests.test_tryton import doctest_setup, doctest_teardown +from trytond.tests.test_tryton import doctest_teardown from trytond.tests.test_tryton import doctest_checker @@ -18,7 +18,7 @@ def suite(): suite.addTests(unittest.TestLoader().loadTestsFromTestCase( SaleInvoiceGroupingTestCase)) suite.addTests(doctest.DocFileSuite('scenario_sale_invoice_grouping.rst', - setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8', + tearDown=doctest_teardown, encoding='utf-8', checker=doctest_checker, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) return suite