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

issue9215
review389851002
---
 setup.py                |  6 +++---
 tests/__init__.py       |  7 -------
 tests/test_module.py    | 12 ++++++++++++
 tests/test_scenario.py  | 22 ++++++++++++++++++++++
 tests/test_user_role.py | 26 --------------------------
 tox.ini                 |  3 ++-
 6 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100644 tests/test_module.py
 create mode 100644 tests/test_scenario.py
 delete mode 100644 tests/test_user_role.py

diff --git a/setup.py b/setup.py
index 058f4e5bec..c19390ccde 100755
--- a/setup.py
+++ b/setup.py
@@ -137,13 +137,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]
     user_role = trytond.modules.user_role
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index fea26d7b56..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.user_role.tests.test_user_role import suite
-except ImportError:
-    from .test_user_role import suite
-
-__all__ = ['suite']
diff --git a/tests/test_module.py b/tests/test_module.py
new file mode 100644
index 0000000000..6a6d509306
--- /dev/null
+++ b/tests/test_module.py
@@ -0,0 +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.
+
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class UserRoleTestCase(ModuleTestCase):
+    'Test User Role module'
+    module = 'user_role'
+
+
+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/tests/test_user_role.py b/tests/test_user_role.py
deleted file mode 100644
index 448a872ce0..0000000000
--- a/tests/test_user_role.py
+++ /dev/null
@@ -1,26 +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.tests.test_tryton import (
-    ModuleTestCase, doctest_checker, doctest_teardown)
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class UserRoleTestCase(ModuleTestCase):
-    'Test User Role module'
-    module = 'user_role'
-
-
-def suite():
-    suite = test_suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            UserRoleTestCase))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_user_role.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
diff --git a/tox.ini b/tox.ini
index 3e9fd9288f..306607c6c8 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=.*/user_role/* setup.py test
+    coverage run --include=.*/user_role/* -m unittest discover -s tests
     coverage report --include=.*/user_role/* --omit=*/tests/*
 deps =
     coverage