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

        issue9215
        review389851002
diffstat:

 setup.py               |   6 +++---
 tests/__init__.py      |   7 -------
 tests/test_module.py   |  12 ++++++++++++
 tests/test_shipping.py |  19 -------------------
 tox.ini                |   3 ++-
 5 files changed, 17 insertions(+), 30 deletions(-)

diffs (86 lines):

diff -r e8c2c25d0b0c -r ff85fa9e4ce9 setup.py
--- a/setup.py  Sun Apr 10 19:11:40 2022 +0200
+++ b/setup.py  Sat Apr 16 18:30:19 2022 +0200
@@ -141,13 +141,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]
     stock_package_shipping = trytond.modules.stock_package_shipping
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff -r e8c2c25d0b0c -r ff85fa9e4ce9 tests/__init__.py
--- a/tests/__init__.py Sun Apr 10 19:11:40 2022 +0200
+++ b/tests/__init__.py Sat Apr 16 18:30:19 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.stock_package_shipping.tests.tes_shipping import suite
-except ImportError:
-    from .test_shipping import suite
-
-__all__ = ['suite']
diff -r e8c2c25d0b0c -r ff85fa9e4ce9 tests/test_module.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_module.py      Sat Apr 16 18:30:19 2022 +0200
@@ -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 StockPackageShippingTestCase(ModuleTestCase):
+    'Test Stock Package Shipping module'
+    module = 'stock_package_shipping'
+
+
+del ModuleTestCase
diff -r e8c2c25d0b0c -r ff85fa9e4ce9 tests/test_shipping.py
--- a/tests/test_shipping.py    Sun Apr 10 19:11:40 2022 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +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 unittest
-
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class StockPackageShippingTestCase(ModuleTestCase):
-    'Test Stock Package Shipping module'
-    module = 'stock_package_shipping'
-
-
-def suite():
-    suite = test_suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            StockPackageShippingTestCase))
-    return suite
diff -r e8c2c25d0b0c -r ff85fa9e4ce9 tox.ini
--- a/tox.ini   Sun Apr 10 19:11:40 2022 +0200
+++ b/tox.ini   Sat Apr 16 18:30:19 2022 +0200
@@ -2,8 +2,9 @@
 envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
 
 [testenv]
+extras = test
 commands =
-    coverage run --include=.*/stock_package_shipping/* setup.py test
+    coverage run --include=.*/stock_package_shipping/* -m unittest discover -s 
tests
     coverage report --include=.*/stock_package_shipping/* --omit=*/tests/*
 deps =
     coverage

Reply via email to