From 16994c5e40d426f7580901d2ec36d57a9f68cae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 16 Apr 2022 18:30:16 +0200 Subject: [PATCH] Replace test setuptools command by unittest discover issue9215 review389851002 --- setup.py | 6 ++--- tests/__init__.py | 7 ------ tests/test_account_es.py | 49 ---------------------------------------- tests/test_module.py | 13 +++++++++++ tests/test_scenario.py | 22 ++++++++++++++++++ tox.ini | 3 ++- 6 files changed, 40 insertions(+), 60 deletions(-) delete mode 100644 tests/test_account_es.py create mode 100644 tests/test_module.py create mode 100644 tests/test_scenario.py diff --git a/setup.py b/setup.py index b5031a08c9..f82a018eff 100755 --- a/setup.py +++ b/setup.py @@ -124,13 +124,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_es = trytond.modules.account_es """, - test_suite='tests', - test_loader='trytond.test_loader:Loader', - tests_require=tests_require, ) diff --git a/tests/__init__.py b/tests/__init__.py index 587ae52472..4effdfa4a2 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,9 +1,2 @@ # 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_es.tests.test_account_es import suite -except ImportError: - from .test_account_es import suite - -__all__ = ['suite'] diff --git a/tests/test_account_es.py b/tests/test_account_es.py deleted file mode 100644 index 36d11164ab..0000000000 --- a/tests/test_account_es.py +++ /dev/null @@ -1,49 +0,0 @@ -# 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 unittest - -import trytond.tests.test_tryton -from trytond.tests.test_tryton import ( - ModuleTestCase, doctest_checker, doctest_teardown) - - -class AccountTestCase(ModuleTestCase): - 'Test Account Es module' - module = 'account_es' - extras = ['account_asset', 'account_payment_sepa', 'sale_advance_payment'] - - -def suite(): - suite = trytond.tests.test_tryton.suite() - suite.addTests(unittest.TestLoader().loadTestsFromTestCase( - AccountTestCase)) - suite.addTests(doctest.DocFileSuite('scenario_reporting.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite('scenario_reporting_compensate.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_reporting_cancelled_invoices.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_reporting_alternate_currency.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_ec_operation_list.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_reporting_surcharge_tax.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - return suite diff --git a/tests/test_module.py b/tests/test_module.py new file mode 100644 index 0000000000..2e4e0937af --- /dev/null +++ b/tests/test_module.py @@ -0,0 +1,13 @@ +# This file is part of Tryton. The COPYRIGHT file at the top level of +# this repository contains the full copyright notices and license terms. + +from trytond.tests.test_tryton import ModuleTestCase + + +class AccountTestCase(ModuleTestCase): + 'Test Account Es module' + module = 'account_es' + extras = ['account_asset', 'account_payment_sepa', 'sale_advance_payment'] + + +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 4f9a3ec6af..3b2ba4468a 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_es/* setup.py test + coverage run --include=.*/account_es/* -m unittest discover -s tests coverage report --include=.*/account_es/* --omit=*/tests/* deps = coverage