From f940dbc97c4baf983e7efbe751cd22d907e0fca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 16 Apr 2022 18:30:18 +0200 Subject: [PATCH] Replace test setuptools command by unittest discover issue9215 review389851002 --- setup.py | 6 ++-- tests/__init__.py | 7 ----- tests/{test_purchase.py => test_module.py} | 36 ++-------------------- tests/test_scenario.py | 22 +++++++++++++ tox.ini | 3 +- 5 files changed, 30 insertions(+), 44 deletions(-) rename tests/{test_purchase.py => test_module.py} (75%) create mode 100644 tests/test_scenario.py diff --git a/setup.py b/setup.py index 20e77bee1f..84f66f0c59 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] purchase = trytond.modules.purchase """, - test_suite='tests', - test_loader='trytond.test_loader:Loader', - tests_require=tests_require, ) diff --git a/tests/__init__.py b/tests/__init__.py index 41d67439f1..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.purchase.tests.test_purchase import suite -except ImportError: - from .test_purchase import suite - -__all__ = ['suite'] diff --git a/tests/test_purchase.py b/tests/test_module.py similarity index 75% rename from tests/test_purchase.py rename to tests/test_module.py index 28df8840a2..4774d2a12a 100644 --- a/tests/test_purchase.py +++ b/tests/test_module.py @@ -1,16 +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. -import doctest -import unittest + from decimal import Decimal -import trytond.tests.test_tryton from trytond.modules.account.tests import create_chart from trytond.modules.company.tests import ( CompanyTestMixin, PartyCompanyCheckEraseMixin, create_company, set_company) 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 @@ -106,31 +103,4 @@ class PurchaseTestCase( self.assertEqual(prices, {product.id: Decimal(2500)}) -def suite(): - suite = trytond.tests.test_tryton.suite() - suite.addTests(unittest.TestLoader().loadTestsFromTestCase( - PurchaseTestCase)) - suite.addTests(doctest.DocFileSuite('scenario_purchase.rst', - tearDown=doctest_teardown, encoding='UTF-8', - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, - checker=doctest_checker)) - suite.addTests(doctest.DocFileSuite('scenario_purchase_empty.rst', - tearDown=doctest_teardown, encoding='UTF-8', - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, - checker=doctest_checker)) - suite.addTests(doctest.DocFileSuite( - 'scenario_purchase_modify_header.rst', - tearDown=doctest_teardown, encoding='utf-8', - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, - checker=doctest_checker)) - suite.addTests(doctest.DocFileSuite( - 'scenario_purchase_return_wizard.rst', - tearDown=doctest_teardown, encoding='utf-8', - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, - checker=doctest_checker)) - suite.addTests(doctest.DocFileSuite( - 'scenario_purchase_copy_product_suppliers.rst', - tearDown=doctest_teardown, encoding='utf-8', - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, - checker=doctest_checker)) - 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 d2d281bf08..3e786c2a67 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=.*/purchase/* setup.py test + coverage run --include=.*/purchase/* -m unittest discover -s tests coverage report --include=.*/purchase/* --omit=*/tests/* deps = coverage