changeset 21ebb9a54107 in modules/carrier_subdivision:default
details:
https://hg.tryton.org/modules/carrier_subdivision?cmd=changeset&node=21ebb9a54107
description:
Replace test setuptools command by unittest discover
issue9215
review389851002
diffstat:
setup.py | 6 +++---
tests/__init__.py | 8 --------
tests/test_carrier_subdivision.py | 31 -------------------------------
tests/test_module.py | 13 +++++++++++++
tests/test_scenario.py | 22 ++++++++++++++++++++++
tox.ini | 3 ++-
6 files changed, 40 insertions(+), 43 deletions(-)
diffs (126 lines):
diff -r 7d269f36b1ba -r 21ebb9a54107 setup.py
--- a/setup.py Sun Apr 10 19:11:38 2022 +0200
+++ b/setup.py Sat Apr 16 18:30:17 2022 +0200
@@ -145,13 +145,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]
carrier_subdivision = trytond.modules.carrier_subdivision
""", # noqa: E501
- test_suite='tests',
- test_loader='trytond.test_loader:Loader',
- tests_require=tests_require,
)
diff -r 7d269f36b1ba -r 21ebb9a54107 tests/__init__.py
--- a/tests/__init__.py Sun Apr 10 19:11:38 2022 +0200
+++ b/tests/__init__.py Sat Apr 16 18:30:17 2022 +0200
@@ -1,10 +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.carrier_subdivision.tests.test_carrier_subdivision
import \
- suite # noqa: E501
-except ImportError:
- from .test_carrier_subdivision import suite
-
-__all__ = ['suite']
diff -r 7d269f36b1ba -r 21ebb9a54107 tests/test_carrier_subdivision.py
--- a/tests/test_carrier_subdivision.py Sun Apr 10 19:11:38 2022 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 CarrierSubdivisionTestCase(ModuleTestCase):
- "Test Carrier Subdivision module"
- module = 'carrier_subdivision'
- extras = ['sale_shipment_cost']
-
-
-def suite():
- suite = test_suite()
- suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
- CarrierSubdivisionTestCase))
- suite.addTests(doctest.DocFileSuite(
- 'scenario_carrier_subdivision.rst',
- tearDown=doctest_teardown, encoding='utf-8',
- checker=doctest_checker,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
- suite.addTests(doctest.DocFileSuite(
- 'scenario_carrier_subdivision_postal_code.rst',
- tearDown=doctest_teardown, encoding='utf-8',
- checker=doctest_checker,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
- return suite
diff -r 7d269f36b1ba -r 21ebb9a54107 tests/test_module.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_module.py Sat Apr 16 18:30:17 2022 +0200
@@ -0,0 +1,13 @@
+# 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 CarrierSubdivisionTestCase(ModuleTestCase):
+ "Test Carrier Subdivision module"
+ module = 'carrier_subdivision'
+ extras = ['sale_shipment_cost']
+
+
+del ModuleTestCase
diff -r 7d269f36b1ba -r 21ebb9a54107 tests/test_scenario.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_scenario.py Sat Apr 16 18:30:17 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 7d269f36b1ba -r 21ebb9a54107 tox.ini
--- a/tox.ini Sun Apr 10 19:11:38 2022 +0200
+++ b/tox.ini Sat Apr 16 18:30:17 2022 +0200
@@ -2,8 +2,9 @@
envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
[testenv]
+extras = test
commands =
- coverage run --include=.*/carrier_subdivision/* setup.py test
+ coverage run --include=.*/carrier_subdivision/* -m unittest discover -s
tests
coverage report --include=.*/carrier_subdivision/* --omit=*/tests/*
deps =
coverage
