From 5b437303dfeabf1474fef392dba33b90dcff80cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 16 Apr 2022 18:30:19 +0200 Subject: [PATCH] Replace test setuptools command by unittest discover issue9215 review389851002 --- setup.py | 4 +--- tests/__init__.py | 8 ------- tests/test_module.py | 13 +++++++++++ tests/test_sale_shipment_cost.py | 40 -------------------------------- tests/test_scenario.py | 22 ++++++++++++++++++ tox.ini | 3 ++- 6 files changed, 38 insertions(+), 52 deletions(-) create mode 100644 tests/test_module.py delete mode 100644 tests/test_sale_shipment_cost.py create mode 100644 tests/test_scenario.py diff --git a/setup.py b/setup.py index 2b14cdb040..a20588b1b2 100755 --- a/setup.py +++ b/setup.py @@ -143,6 +143,7 @@ setup(name=name, python_requires='>=3.7', install_requires=requires, extras_require={ + 'test': tests_require, }, dependency_links=dependency_links, zip_safe=False, @@ -150,7 +151,4 @@ setup(name=name, [trytond.modules] sale_shipment_cost = trytond.modules.sale_shipment_cost """, - test_suite='tests', - test_loader='trytond.test_loader:Loader', - tests_require=tests_require, ) diff --git a/tests/__init__.py b/tests/__init__.py index b939e77c68..4effdfa4a2 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,10 +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.sale_shipment_cost.tests.test_sale_shipment_cost import \ - suite # noqa: E501 -except ImportError: - from .test_sale_shipment_cost import suite - -__all__ = ['suite'] diff --git a/tests/test_module.py b/tests/test_module.py new file mode 100644 index 0000000000..63360b3adf --- /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 SaleShipmentCostTestCase(ModuleTestCase): + 'Test Sale Shipment Cost module' + module = 'sale_shipment_cost' + extras = ['sale_promotion'] + + +del ModuleTestCase diff --git a/tests/test_sale_shipment_cost.py b/tests/test_sale_shipment_cost.py deleted file mode 100644 index aefde3a127..0000000000 --- a/tests/test_sale_shipment_cost.py +++ /dev/null @@ -1,40 +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 SaleShipmentCostTestCase(ModuleTestCase): - 'Test Sale Shipment Cost module' - module = 'sale_shipment_cost' - extras = ['sale_promotion'] - - -def suite(): - suite = trytond.tests.test_tryton.suite() - suite.addTests(unittest.TestLoader().loadTestsFromTestCase( - SaleShipmentCostTestCase)) - suite.addTests(doctest.DocFileSuite('scenario_sale_shipment_cost.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_sale_shipment_cost_modify_price.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_sale_shipment_cost_promotion.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - suite.addTests(doctest.DocFileSuite( - 'scenario_sale_shipment_cost_stock.rst', - tearDown=doctest_teardown, encoding='utf-8', - checker=doctest_checker, - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) - return suite 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 f430b3fad4..9e5d2e716c 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=.*/sale_shipment_cost/* setup.py test + coverage run --include=.*/sale_shipment_cost/* -m unittest discover -s tests coverage report --include=.*/sale_shipment_cost/* --omit=*/tests/* deps = coverage