From 30c330fa1df8ad7a1ef4c41582c38fee7d8159e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 26 Aug 2016 09:58:58 +0200 Subject: [PATCH] Use install_modules tools in scenario issue5794 --- tests/scenario_commission_waiting.rst | 22 ++++------------------ tests/test_commission_waiting.py | 4 ++-- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/tests/scenario_commission_waiting.rst b/tests/scenario_commission_waiting.rst index e5c6a1edcd..3e9fec25aa 100644 --- a/tests/scenario_commission_waiting.rst +++ b/tests/scenario_commission_waiting.rst @@ -7,7 +7,8 @@ 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_fiscalyear, \ @@ -16,30 +17,15 @@ Imports:: ... set_fiscalyear_invoice_sequences, create_payment_term >>> today = datetime.date.today() -Create database:: +Install commission_waiting:: - >>> config = config.set_trytond() - >>> config.pool.test = True - -Install commission:: - - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'commission_waiting'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('commission_waiting') Create company:: >>> _ = create_company() >>> company = get_company() -Reload the context:: - - >>> User = Model.get('res.user') - >>> config._context = User.get_preferences(True, config.context) - Create fiscal year:: >>> fiscalyear = set_fiscalyear_invoice_sequences( diff --git a/tests/test_commission_waiting.py b/tests/test_commission_waiting.py index c3eb328c87..0bbdbfbc0e 100644 --- a/tests/test_commission_waiting.py +++ b/tests/test_commission_waiting.py @@ -7,7 +7,7 @@ import doctest from trytond.tests.test_tryton import ModuleTestCase from trytond.tests.test_tryton import suite as test_suite -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 @@ -21,7 +21,7 @@ def suite(): suite.addTests(unittest.TestLoader().loadTestsFromTestCase( CommissionWaitingTestCase)) suite.addTests(doctest.DocFileSuite('scenario_commission_waiting.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