changeset ec2652aba863 in modules/account_asset:default
details: 
https://hg.tryton.org/modules/account_asset?cmd=changeset&node=ec2652aba863
description:
        Replace test setuptools command by unittest discover

        issue9215
        review389851002
diffstat:

 setup.py                    |   6 ++--
 tests/__init__.py           |   7 -----
 tests/test_account_asset.py |  62 ---------------------------------------------
 tests/test_module.py        |  42 ++++++++++++++++++++++++++++++
 tests/test_scenario.py      |  22 +++++++++++++++
 tox.ini                     |   2 +-
 6 files changed, 68 insertions(+), 73 deletions(-)

diffs (183 lines):

diff -r 77019466d440 -r ec2652aba863 setup.py
--- a/setup.py  Sun Apr 10 19:11:37 2022 +0200
+++ b/setup.py  Sat Apr 16 18:30:15 2022 +0200
@@ -140,13 +140,13 @@
     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]
     account_asset = trytond.modules.account_asset
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff -r 77019466d440 -r ec2652aba863 tests/__init__.py
--- a/tests/__init__.py Sun Apr 10 19:11:37 2022 +0200
+++ b/tests/__init__.py Sat Apr 16 18:30:15 2022 +0200
@@ -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.account_asset.tests.test_account_asset import suite
-except ImportError:
-    from .test_account_asset import suite
-
-__all__ = ['suite']
diff -r 77019466d440 -r ec2652aba863 tests/test_account_asset.py
--- a/tests/test_account_asset.py       Sun Apr 10 19:11:37 2022 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +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 datetime as dt
-import doctest
-import unittest
-
-import trytond.tests.test_tryton
-from trytond.modules.account_asset.asset import normalized_delta
-from trytond.tests.test_tryton import (
-    ModuleTestCase, doctest_checker, doctest_teardown)
-
-
-class AccountAssetTestCase(ModuleTestCase):
-    'Test AccountAsset module'
-    module = 'account_asset'
-    extras = ['purchase']
-
-    def test_normalized_delta(self):
-        "Test normalized detal"
-        for start, end, delta in [
-                (dt.date(2019, 1, 1), dt.date(2019, 12, 31),
-                    dt.timedelta(days=364)),
-                (dt.date(2019, 1, 1), dt.date(2020, 1, 1),
-                    dt.timedelta(days=365)),
-                (dt.date(2019, 1, 1), dt.date(2019, 3, 1),
-                    dt.timedelta(days=31 + 28)),
-                (dt.date(2024, 1, 1), dt.date(2024, 2, 1),
-                    dt.timedelta(days=31)),
-                (dt.date(2024, 1, 1), dt.date(2024, 3, 1),
-                    dt.timedelta(days=31 + 28)),
-                (dt.date(2024, 3, 1), dt.date(2024, 4, 1),
-                    dt.timedelta(days=31)),
-                (dt.date(2024, 1, 1), dt.date(2025, 1, 1),
-                    dt.timedelta(days=365)),
-                (dt.date(2023, 1, 1), dt.date(2025, 1, 1),
-                    dt.timedelta(days=365 * 2)),
-                (dt.date(2000, 1, 1), dt.date(2020, 1, 1),
-                    dt.timedelta(days=365 * 20)),
-                ]:
-            self.assertEqual(
-                normalized_delta(start, end), delta,
-                msg='%s - %s' % (start, end))
-
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-        AccountAssetTestCase))
-    suite.addTests(doctest.DocFileSuite('scenario_account_asset.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_account_asset_depreciated.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite('scenario_purchase_asset.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
diff -r 77019466d440 -r ec2652aba863 tests/test_module.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_module.py      Sat Apr 16 18:30:15 2022 +0200
@@ -0,0 +1,42 @@
+# 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 datetime as dt
+
+from trytond.modules.account_asset.asset import normalized_delta
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class AccountAssetTestCase(ModuleTestCase):
+    'Test AccountAsset module'
+    module = 'account_asset'
+    extras = ['purchase']
+
+    def test_normalized_delta(self):
+        "Test normalized delta"
+        for start, end, delta in [
+                (dt.date(2019, 1, 1), dt.date(2019, 12, 31),
+                    dt.timedelta(days=364)),
+                (dt.date(2019, 1, 1), dt.date(2020, 1, 1),
+                    dt.timedelta(days=365)),
+                (dt.date(2019, 1, 1), dt.date(2019, 3, 1),
+                    dt.timedelta(days=31 + 28)),
+                (dt.date(2024, 1, 1), dt.date(2024, 2, 1),
+                    dt.timedelta(days=31)),
+                (dt.date(2024, 1, 1), dt.date(2024, 3, 1),
+                    dt.timedelta(days=31 + 28)),
+                (dt.date(2024, 3, 1), dt.date(2024, 4, 1),
+                    dt.timedelta(days=31)),
+                (dt.date(2024, 1, 1), dt.date(2025, 1, 1),
+                    dt.timedelta(days=365)),
+                (dt.date(2023, 1, 1), dt.date(2025, 1, 1),
+                    dt.timedelta(days=365 * 2)),
+                (dt.date(2000, 1, 1), dt.date(2020, 1, 1),
+                    dt.timedelta(days=365 * 20)),
+                ]:
+            self.assertEqual(
+                normalized_delta(start, end), delta,
+                msg='%s - %s' % (start, end))
+
+
+del ModuleTestCase
diff -r 77019466d440 -r ec2652aba863 tests/test_scenario.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_scenario.py    Sat Apr 16 18:30:15 2022 +0200
@@ -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 -r 77019466d440 -r ec2652aba863 tox.ini
--- a/tox.ini   Sun Apr 10 19:11:37 2022 +0200
+++ b/tox.ini   Sat Apr 16 18:30:15 2022 +0200
@@ -3,7 +3,7 @@
 
 [testenv]
 commands =
-    coverage run --include=.*/account_asset/* setup.py test
+    coverage run --include=.*/account_asset/* -m unittest discover -s tests
     coverage report --include=.*/account_asset/* --omit=*/tests/*
 deps =
     coverage

Reply via email to