From 37a8b7f7bfc49f8f73f081eaad04899b9761dd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 26 Aug 2016 10:00:04 +0200 Subject: [PATCH] Use install_modules tools in scenario issue5794 --- tests/scenario_stock_internal_supply.rst | 21 ++++------------- ...scenario_stock_supply_purchase_request.rst | 23 +++++-------------- tests/test_stock_supply.py | 6 ++--- 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/tests/scenario_stock_internal_supply.rst b/tests/scenario_stock_internal_supply.rst index 8a84f070c4..5b1555af2f 100644 --- a/tests/scenario_stock_internal_supply.rst +++ b/tests/scenario_stock_internal_supply.rst @@ -7,36 +7,25 @@ Imports:: >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> 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 >>> today = datetime.date.today() -Create database:: +Install stock_supply Module:: - >>> config = config.set_trytond() - >>> config.pool.test = True - -Install stock Module:: - - >>> Module = Model.get('ir.module') - >>> module, = Module.find([('name', '=', 'stock_supply')]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('stock_supply') Create company:: >>> _ = create_company() >>> company = get_company() -Reload the context:: +Create stock admin user:: >>> User = Model.get('res.user') >>> Group = Model.get('res.group') - >>> config._context = User.get_preferences(True, config.context) - -Create stock admin user:: - >>> stock_admin_user = User() >>> stock_admin_user.name = 'Stock Admin' >>> stock_admin_user.login = 'stock_admin' diff --git a/tests/scenario_stock_supply_purchase_request.rst b/tests/scenario_stock_supply_purchase_request.rst index d2d3e5168d..1c0c83a218 100644 --- a/tests/scenario_stock_supply_purchase_request.rst +++ b/tests/scenario_stock_supply_purchase_request.rst @@ -7,36 +7,23 @@ Imports:: >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> 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, ... get_accounts) >>> today = datetime.date.today() -Create database:: +Install stock_supply Module:: - >>> config = config.set_trytond() - >>> config.pool.test = True - -Install stock Module:: - - >>> Module = Model.get('ir.module') - >>> module, = Module.find([('name', '=', 'stock_supply')]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('stock_supply') 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) @@ -53,6 +40,8 @@ Create parties:: Create stock admin user:: + >>> User = Model.get('res.user') + >>> Group = Model.get('res.group') >>> stock_admin_user = User() >>> stock_admin_user.name = 'Stock Admin' >>> stock_admin_user.login = 'stock_admin' diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py index 8faa1e2375..211a8ed998 100644 --- a/tests/test_stock_supply.py +++ b/tests/test_stock_supply.py @@ -6,7 +6,7 @@ import datetime from decimal import Decimal import trytond.tests.test_tryton from trytond.tests.test_tryton import ModuleTestCase, with_transaction -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 from trytond.pool import Pool @@ -125,12 +125,12 @@ def suite(): suite.addTests(unittest.TestLoader().loadTestsFromTestCase( StockSupplyTestCase)) suite.addTests(doctest.DocFileSuite('scenario_stock_internal_supply.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)) suite.addTests(doctest.DocFileSuite( 'scenario_stock_supply_purchase_request.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