From 05f38510a5080663dc5229e5f2f3389bcf7937c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 16 Apr 2022 18:30:15 +0200 Subject: [PATCH] Replace test setuptools command by unittest discover issue9215 review389851002 --- setup.py | 6 +- tests/__init__.py | 8 +-- tests/{test_account.py => test_module.py} | 76 ++--------------------- tests/test_scenario.py | 22 +++++++ tox.ini | 3 +- 5 files changed, 33 insertions(+), 82 deletions(-) rename tests/{test_account.py => test_module.py} (95%) create mode 100644 tests/test_scenario.py diff --git a/setup.py b/setup.py index bac7d1ba56..2a2f309e1c 100755 --- a/setup.py +++ b/setup.py @@ -141,13 +141,13 @@ setup(name=name, license='GPL-3', python_requires='>=3.7', install_requires=requires, + extras_require={ + 'test': tests_require, + }, dependency_links=dependency_links, zip_safe=False, entry_points=""" [trytond.modules] account = trytond.modules.account """, - test_suite='tests', - test_loader='trytond.test_loader:Loader', - tests_require=tests_require, ) diff --git a/tests/__init__.py b/tests/__init__.py index 251f78752e..72c3439cb6 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,10 +1,6 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -try: - from trytond.modules.account.tests.test_account import ( - create_chart, get_fiscalyear, suite) -except ImportError: - from .test_account import create_chart, get_fiscalyear, suite +from .test_module import create_chart, get_fiscalyear -__all__ = ['suite', 'create_chart', 'get_fiscalyear'] +__all__ = ['create_chart', 'get_fiscalyear'] diff --git a/tests/test_account.py b/tests/test_module.py similarity index 95% rename from tests/test_account.py rename to tests/test_module.py index b649316d63..4236db2463 100644 --- a/tests/test_account.py +++ b/tests/test_module.py @@ -1,25 +1,21 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. + import datetime -import doctest -import unittest from decimal import Decimal from dateutil.relativedelta import relativedelta -import trytond.tests.test_tryton from trytond.exceptions import UserError +from trytond.modules.account.exceptions import FiscalYearDatesError from trytond.modules.account.tax import TaxableMixin from trytond.modules.company.tests import ( CompanyTestMixin, PartyCompanyCheckEraseMixin, create_company, set_company) from trytond.modules.currency.tests import create_currency from trytond.pool import Pool -from trytond.tests.test_tryton import ( - ModuleTestCase, doctest_checker, doctest_teardown, with_transaction) +from trytond.tests.test_tryton import ModuleTestCase, with_transaction from trytond.transaction import Transaction -from ..exceptions import FiscalYearDatesError - def create_chart(company, tax=False, chart='account.account_template_root_en'): pool = Pool() @@ -1741,68 +1737,4 @@ class AccountTestCase( 1) -def suite(): - suite = trytond.tests.test_tryton.suite() - suite.addTests(unittest.TestLoader().loadTestsFromTestCase( - AccountTestCase)) - suite.addTests(doctest.DocFileSuite( - 'scenario_account_reconciliation.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_account_reconcile.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_account_reconcile_automatic.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_move_cancel.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_move_line_group.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_move_line_reschedule.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_move_template.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_reports.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_renew_fiscalyear.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_close_fiscalyear.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_account_active.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_tax_code.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - return suite +del ModuleTestCase diff --git a/tests/test_scenario.py b/tests/test_scenario.py new file mode 100644 index 0000000000..c80e682a7f --- /dev/null +++ b/tests/test_scenario.py @@ -0,0 +1,22 @@ +# This file is part of Tryton. The COPYRIGHT file at the top level of +# this repository contains the full copyright notices and license terms. + +import doctest +import glob +import os + +from trytond.tests.test_tryton import doctest_checker, doctest_teardown + + +def load_tests(loader, tests, pattern): + cwd = os.getcwd() + try: + os.chdir(os.path.dirname(__file__)) + for scenario in glob.glob('*.rst'): + tests.addTests(doctest.DocFileSuite( + scenario, tearDown=doctest_teardown, encoding='utf-8', + checker=doctest_checker, + optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) + finally: + os.chdir(cwd) + return tests diff --git a/tox.ini b/tox.ini index 0f2069c644..72bfbde3d0 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,9 @@ envlist = {py37,py38,py39,py310}-{sqlite,postgresql} [testenv] +extras = test commands = - coverage run --include=.*/account/* setup.py test + coverage run --include=.*/account/* -m unittest discover -s tests coverage report --include=.*/account/* --omit=*/tests/* deps = coverage