From 4cd71eb43a6c56d881924f216d406bc07d623d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
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         |  8 --------
 tests/test_module.py      | 14 +++++++++++++
 tests/test_product_kit.py | 42 ---------------------------------------
 tests/test_scenario.py    | 22 ++++++++++++++++++++
 tox.ini                   |  3 ++-
 6 files changed, 41 insertions(+), 54 deletions(-)
 create mode 100644 tests/test_module.py
 delete mode 100644 tests/test_product_kit.py
 create mode 100644 tests/test_scenario.py

diff --git a/setup.py b/setup.py
index 14d0684594..1f0fe2d5a1 100755
--- a/setup.py
+++ b/setup.py
@@ -150,13 +150,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]
     product_kit = trytond.modules.product_kit
     """,  # noqa: E501
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index a6d5fc6983..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.product_kit.tests.test_product_kit import \
-        suite  # noqa: E501
-except ImportError:
-    from .test_product_kit import suite
-
-__all__ = ['suite']
diff --git a/tests/test_module.py b/tests/test_module.py
new file mode 100644
index 0000000000..b3d8d391ff
--- /dev/null
+++ b/tests/test_module.py
@@ -0,0 +1,14 @@
+# 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 ProductKitTestCase(CompanyTestMixin, ModuleTestCase):
+    'Test Product Kit module'
+    module = 'product_kit'
+    extras = ['sale', 'purchase']
+
+
+del ModuleTestCase
diff --git a/tests/test_product_kit.py b/tests/test_product_kit.py
deleted file mode 100644
index 43582db6f1..0000000000
--- a/tests/test_product_kit.py
+++ /dev/null
@@ -1,42 +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 ProductKitTestCase(CompanyTestMixin, ModuleTestCase):
-    'Test Product Kit module'
-    module = 'product_kit'
-    extras = ['sale', 'purchase']
-
-
-def suite():
-    suite = test_suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            ProductKitTestCase))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_product_kit.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_product_kit_copy.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_product_kit_sale.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_product_kit_purchase.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 10a745da95..3a67a5774b 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=.*/product_kit/* setup.py test
+    coverage run --include=.*/product_kit/* -m unittest discover -s tests
     coverage report --include=.*/product_kit/* --omit=*/tests/*
 deps =
     coverage