changeset c1aacaeba5a4 in modules/web_shop:default
details: https://hg.tryton.org/modules/web_shop?cmd=changeset&node=c1aacaeba5a4
description:
Replace test setuptools command by unittest discover
issue9215
review389851002
diffstat:
setup.py | 6 +++---
tests/__init__.py | 7 -------
tests/test_module.py | 14 ++++++++++++++
tests/test_web_shop.py | 21 ---------------------
tox.ini | 3 ++-
5 files changed, 19 insertions(+), 32 deletions(-)
diffs (90 lines):
diff -r 5f31ae95e9f1 -r c1aacaeba5a4 setup.py
--- a/setup.py Mon Apr 11 23:24:21 2022 +0200
+++ b/setup.py Sat Apr 16 18:30:20 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]
web_shop = trytond.modules.web_shop
""",
- test_suite='tests',
- test_loader='trytond.test_loader:Loader',
- tests_require=tests_require,
)
diff -r 5f31ae95e9f1 -r c1aacaeba5a4 tests/__init__.py
--- a/tests/__init__.py Mon Apr 11 23:24:21 2022 +0200
+++ b/tests/__init__.py Sat Apr 16 18:30:20 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.web_shop.tests.test_web_shop import suite
-except ImportError:
- from .test_web_shop import suite
-
-__all__ = ['suite']
diff -r 5f31ae95e9f1 -r c1aacaeba5a4 tests/test_module.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_module.py Sat Apr 16 18:30:20 2022 +0200
@@ -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 WebShopTestCase(CompanyTestMixin, ModuleTestCase):
+ 'Test Web Shop module'
+ module = 'web_shop'
+ extras = ['product_attribute', 'product_image']
+
+
+del ModuleTestCase
diff -r 5f31ae95e9f1 -r c1aacaeba5a4 tests/test_web_shop.py
--- a/tests/test_web_shop.py Mon Apr 11 23:24:21 2022 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +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.modules.company.tests import CompanyTestMixin
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class WebShopTestCase(CompanyTestMixin, ModuleTestCase):
- 'Test Web Shop module'
- module = 'web_shop'
- extras = ['product_attribute', 'product_image']
-
-
-def suite():
- suite = test_suite()
- suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
- WebShopTestCase))
- return suite
diff -r 5f31ae95e9f1 -r c1aacaeba5a4 tox.ini
--- a/tox.ini Mon Apr 11 23:24:21 2022 +0200
+++ b/tox.ini Sat Apr 16 18:30:20 2022 +0200
@@ -2,8 +2,9 @@
envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
[testenv]
+extras = test
commands =
- coverage run --include=.*/web_shop/* setup.py test
+ coverage run --include=.*/web_shop/* -m unittest discover -s tests
coverage report --include=.*/web_shop/* --omit=*/tests/*
deps =
coverage
