From 123af655334f0cd288babc1837adac9f78361f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 26 Aug 2016 09:57:45 +0200 Subject: [PATCH] Use install_modules tools in scenario issue5794 review25611002 --- tests/scenario_account_reconciliation.rst | 15 +++------------ tests/scenario_move_cancel.rst | 15 +++------------ tests/scenario_move_template.rst | 15 +++------------ tests/scenario_reports.rst | 15 +++------------ tests/test_account.py | 10 +++++----- 5 files changed, 17 insertions(+), 53 deletions(-) diff --git a/tests/scenario_account_reconciliation.rst b/tests/scenario_account_reconciliation.rst index 62580cb502..e89f1b656f 100644 --- a/tests/scenario_account_reconciliation.rst +++ b/tests/scenario_account_reconciliation.rst @@ -7,26 +7,17 @@ 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, \ ... create_chart, get_accounts >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install account:: - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'account'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('account') Create company:: diff --git a/tests/scenario_move_cancel.rst b/tests/scenario_move_cancel.rst index c1996dbc1b..9c8e311b10 100644 --- a/tests/scenario_move_cancel.rst +++ b/tests/scenario_move_cancel.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, \ @@ -15,19 +16,9 @@ Imports:: >>> from trytond.modules.currency.tests.tools import get_currency >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install account:: - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'account'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('account') Create company:: diff --git a/tests/scenario_move_template.rst b/tests/scenario_move_template.rst index d764a69deb..d86c171d29 100644 --- a/tests/scenario_move_template.rst +++ b/tests/scenario_move_template.rst @@ -5,25 +5,16 @@ Move Template 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_fiscalyear, \ ... create_chart, get_accounts, create_tax, set_tax_code -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install account:: - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'account'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('account') Create company:: diff --git a/tests/scenario_reports.rst b/tests/scenario_reports.rst index 9064f8342a..a537202dae 100644 --- a/tests/scenario_reports.rst +++ b/tests/scenario_reports.rst @@ -7,26 +7,17 @@ Imports:: >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal - >>> from proteus import config, Model, Wizard, Report + >>> from proteus import Model, Wizard, Report + >>> 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, \ ... create_chart, get_accounts >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install account:: - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'account'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('account') Create company:: diff --git a/tests/test_account.py b/tests/test_account.py index 9caced7f8f..3b5a51cbac 100644 --- a/tests/test_account.py +++ b/tests/test_account.py @@ -8,7 +8,7 @@ from dateutil.relativedelta import relativedelta from trytond.pool import Pool 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.transaction import Transaction @@ -840,22 +840,22 @@ def suite(): AccountTestCase)) suite.addTests(doctest.DocFileSuite( 'scenario_account_reconciliation.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_move_cancel.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_move_template.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_reports.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