diff --git a/tests/scenario_invoice.rst b/tests/scenario_invoice.rst index b5fbd457e5..67a78564fa 100644 --- a/tests/scenario_invoice.rst +++ b/tests/scenario_invoice.rst @@ -7,7 +7,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, \ @@ -16,18 +17,9 @@ Imports:: ... set_fiscalyear_invoice_sequences >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install account_invoice:: - >>> Module = Model.get('ir.module') - >>> account_invoice_module, = Module.find( - ... [('name', '=', 'account_invoice')]) - >>> account_invoice_module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('account_invoice') Create company:: diff --git a/tests/scenario_invoice_alternate_currency.rst b/tests/scenario_invoice_alternate_currency.rst index b0b7e6c4bf..b975d331d1 100644 --- a/tests/scenario_invoice_alternate_currency.rst +++ b/tests/scenario_invoice_alternate_currency.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.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -18,18 +19,9 @@ Imports:: ... set_fiscalyear_invoice_sequences >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install account_invoice:: - >>> Module = Model.get('ir.module') - >>> account_invoice_module, = Module.find( - ... [('name', '=', 'account_invoice')]) - >>> account_invoice_module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('account_invoice') Create company:: diff --git a/tests/scenario_invoice_supplier.rst b/tests/scenario_invoice_supplier.rst index ff0d962165..0e5c1f4085 100644 --- a/tests/scenario_invoice_supplier.rst +++ b/tests/scenario_invoice_supplier.rst @@ -7,7 +7,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, \ @@ -16,18 +17,9 @@ Imports:: ... set_fiscalyear_invoice_sequences >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install account_invoice:: - >>> Module = Model.get('ir.module') - >>> account_invoice_module, = Module.find( - ... [('name', '=', 'account_invoice')]) - >>> account_invoice_module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('account_invoice') Create company:: diff --git a/tests/test_account_invoice.py b/tests/test_account_invoice.py index d90a1d19b0..9621c22a09 100644 --- a/tests/test_account_invoice.py +++ b/tests/test_account_invoice.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 @@ -208,16 +208,16 @@ def suite(): suite.addTests(unittest.TestLoader().loadTestsFromTestCase( AccountInvoiceTestCase)) suite.addTests(doctest.DocFileSuite('scenario_invoice.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_invoice_supplier.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_invoice_alternate_currency.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