changeset a30f88908cbc in modules/country:default
details: https://hg.tryton.org/modules/country?cmd=changeset&node=a30f88908cbc
description:
Replace test setuptools command by unittest discover
issue9215
review389851002
diffstat:
setup.py | 4 +---
tests/__init__.py | 7 -------
tests/test_country.py | 25 -------------------------
tests/test_module.py | 12 ++++++++++++
tests/test_scenario.py | 22 ++++++++++++++++++++++
tox.ini | 3 ++-
6 files changed, 37 insertions(+), 36 deletions(-)
diffs (117 lines):
diff -r c98d1a6f5198 -r a30f88908cbc setup.py
--- a/setup.py Sun Apr 10 19:11:38 2022 +0200
+++ b/setup.py Sat Apr 16 18:30:17 2022 +0200
@@ -143,6 +143,7 @@
install_requires=requires,
extras_require={
'data': ['pycountry', get_require_version('proteus')],
+ 'test': tests_require,
'GeoNames': [get_require_version('proteus')],
},
dependency_links=dependency_links,
@@ -154,7 +155,4 @@
trytond_import_countries =
trytond.modules.country.scripts.import_countries:run [data]
trytond_import_postal_codes =
trytond.modules.country.scripts.import_postal_codes:run [GeoNames]
""", # noqa: E501
- test_suite='tests',
- test_loader='trytond.test_loader:Loader',
- tests_require=tests_require,
)
diff -r c98d1a6f5198 -r a30f88908cbc 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,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.country.tests.test_country import suite
-except ImportError:
- from .test_country import suite
-
-__all__ = ['suite']
diff -r c98d1a6f5198 -r a30f88908cbc tests/test_country.py
--- a/tests/test_country.py Sun Apr 10 19:11:38 2022 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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
-
-import trytond.tests.test_tryton
-from trytond.tests.test_tryton import (
- ModuleTestCase, doctest_checker, doctest_teardown)
-
-
-class CountryTestCase(ModuleTestCase):
- 'Test Country module'
- module = 'country'
-
-
-def suite():
- suite = trytond.tests.test_tryton.suite()
- suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
- CountryTestCase))
- suite.addTests(doctest.DocFileSuite(
- 'scenario_country_import.rst',
- tearDown=doctest_teardown, encoding='utf-8',
- checker=doctest_checker,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
- return suite
diff -r c98d1a6f5198 -r a30f88908cbc 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,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 CountryTestCase(ModuleTestCase):
+ 'Test Country module'
+ module = 'country'
+
+
+del ModuleTestCase
diff -r c98d1a6f5198 -r a30f88908cbc 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 c98d1a6f5198 -r a30f88908cbc 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=.*/country/* setup.py test
+ coverage run --include=.*/country/* -m unittest discover -s tests
coverage report --include=.*/country/* --omit=*/tests/*
deps =
coverage
