Replace test setuptools command by unittest discover

issue9215
review389851002

setup.py

@@ -155,13 +155,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]
     incoterm = trytond.modules.incoterm
     """,  # noqa: E501
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )

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.incoterm.tests.test_incoterm import \
-        suite  # noqa: E501
-except ImportError:
-    from .test_incoterm import suite
-
-__all__ = ['suite']

tests/test_incoterm.py

@@ -1,32 +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
-
-from trytond.modules.company.tests import CompanyTestMixin
-from trytond.tests.test_tryton import (
-    ModuleTestCase, doctest_checker, doctest_teardown)
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class IncotermTestCase(CompanyTestMixin, ModuleTestCase):
-    'Test Incoterm module'
-    module = 'incoterm'
-    extras = [
-        'carrier', 'company', 'purchase', 'purchase_request_quotation',
-        'sale', 'sale_shipment_cost', 'sale_opportunity',
-        'sale_invoice_grouping', 'stock', 'account_invoice',
-        'account_invoice_stock']
-
-
-def suite():
-    suite = test_suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            IncotermTestCase))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_incoterm.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite

tests/test_module.py

@@ -0,0 +1,18 @@
+# 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.modules.company.tests import CompanyTestMixin
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class IncotermTestCase(CompanyTestMixin, ModuleTestCase):
+    'Test Incoterm module'
+    module = 'incoterm'
+    extras = [
+        'carrier', 'company', 'purchase', 'purchase_request_quotation',
+        'sale', 'sale_shipment_cost', 'sale_opportunity',
+        'sale_invoice_grouping', 'stock', 'account_invoice',
+        'account_invoice_stock']
+
+
+del ModuleTestCase

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

tox.ini

@@ -2,8 +2,9 @@
 envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
 
 [testenv]
+extras = test
 commands =
-    coverage run --include=.*/incoterm/* setup.py test
+    coverage run --include=.*/incoterm/* -m unittest discover -s tests
     coverage report --include=.*/incoterm/* --omit=*/tests/*
 deps =
     coverage