From 7443181b3eaaeef2017decaa3442cd5384cc0dce 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:17 +0200
Subject: [PATCH] Replace test setuptools command by unittest discover

issue9215
review389851002
---
 setup.py                                     |  4 +---
 tests/__init__.py                            |  6 ------
 tests/{test_commission.py => test_module.py} | 21 ++-----------------
 tests/test_scenario.py                       | 22 ++++++++++++++++++++
 tox.ini                                      |  3 ++-
 5 files changed, 27 insertions(+), 29 deletions(-)
 rename tests/{test_commission.py => test_module.py} (80%)
 create mode 100644 tests/test_scenario.py

diff --git a/setup.py b/setup.py
index d71177fa26..360767f141 100755
--- a/setup.py
+++ b/setup.py
@@ -141,6 +141,7 @@ setup(name=name,
     install_requires=requires,
     extras_require={
         'sparklines': ['pygal'],
+        'test': tests_require,
         },
     dependency_links=dependency_links,
     zip_safe=False,
@@ -148,7 +149,4 @@ setup(name=name,
     [trytond.modules]
     commission = trytond.modules.commission
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index f6b8a28a1f..4effdfa4a2 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,8 +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.commission.tests.test_commission import suite
-except ImportError:
-    from .test_commission import suite
-
-__all__ = ['suite']
diff --git a/tests/test_commission.py b/tests/test_module.py
similarity index 80%
rename from tests/test_commission.py
rename to tests/test_module.py
index 05014ce3ba..80db0da23c 100644
--- a/tests/test_commission.py
+++ b/tests/test_module.py
@@ -1,17 +1,12 @@
 # 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
 
 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)
-from trytond.tests.test_tryton import suite as test_suite
-from trytond.tests.test_tryton import with_transaction
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 
 
 def create_product(name, list_price, categories=None):
@@ -121,16 +116,4 @@ class CommissionTestCase(
             self.assertEqual(plan.compute(Decimal(1), None), None)
 
 
-def suite():
-    suite = test_suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            CommissionTestCase))
-    suite.addTests(doctest.DocFileSuite('scenario_commission.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite('scenario_agent_selection.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    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 ff5ea08486..fec79d37a5 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=.*/commission/* setup.py test
+    coverage run --include=.*/commission/* -m unittest discover -s tests
     coverage report --include=.*/commission/* --omit=*/tests/*
 deps =
     coverage