From 9d02232f61805431358cb0131499d9244aaacf09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 26 Aug 2016 09:59:41 +0200 Subject: [PATCH] Use install_modules tools in scenario issue5794 --- tests/scenario_sale_opportunity.rst | 21 +++++---------------- tests/test_sale_opportunity.py | 4 ++-- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/scenario_sale_opportunity.rst b/tests/scenario_sale_opportunity.rst index f72880311a..c64db634b8 100644 --- a/tests/scenario_sale_opportunity.rst +++ b/tests/scenario_sale_opportunity.rst @@ -5,7 +5,8 @@ Sale Opportunity Scenario Imports:: >>> from decimal import Decimal - >>> 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_chart, \ @@ -13,29 +14,15 @@ Imports:: >>> from trytond.modules.account_invoice.tests.tools import \ ... create_payment_term -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install sale_opportunity:: - >>> Module = Model.get('ir.module') - >>> sale_opportunity_module, = Module.find([('name', '=', 'sale_opportunity')]) - >>> sale_opportunity_module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('sale_opportunity') Create company:: >>> _ = create_company() >>> company = get_company() -Reload the context:: - - >>> User = Model.get('res.user') - >>> Group = Model.get('res.group') - >>> config._context = User.get_preferences(True, config.context) - Create chart of accounts:: >>> _ = create_chart(company) @@ -44,6 +31,8 @@ Create chart of accounts:: Create sale opportunity user:: + >>> User = Model.get('res.user') + >>> Group = Model.get('res.group') >>> sale_opportunity_user = User() >>> sale_opportunity_user.name = 'Sale Opportunity' >>> sale_opportunity_user.login = 'sale_opportunity' diff --git a/tests/test_sale_opportunity.py b/tests/test_sale_opportunity.py index d4f167b21e..009eeb52e4 100644 --- a/tests/test_sale_opportunity.py +++ b/tests/test_sale_opportunity.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( SaleOpportunityTestCase)) suite.addTests(doctest.DocFileSuite('scenario_sale_opportunity.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