changeset 36180eeeff8e in trytond-gis:default
details: https://hg.tryton.org/trytond-gis?cmd=changeset&node=36180eeeff8e
description:
Replace test setuptools command by unittest discover
issue9215
review389851002
diffstat:
CHANGELOG | 1 +
setup.py | 4 ----
tox.ini | 3 ++-
trytond_gis/tests/__init__.py | 3 +--
trytond_gis/tests/test_fields.py | 7 -------
5 files changed, 4 insertions(+), 14 deletions(-)
diffs (69 lines):
diff -r f212aff3ba77 -r 36180eeeff8e CHANGELOG
--- a/CHANGELOG Wed Apr 06 23:37:45 2022 +0200
+++ b/CHANGELOG Sat Apr 16 18:30:20 2022 +0200
@@ -1,3 +1,4 @@
+* Use unittest discover
* Add support for Python 3.10
* Remove support for Python 3.6
diff -r f212aff3ba77 -r 36180eeeff8e setup.py
--- a/setup.py Wed Apr 06 23:37:45 2022 +0200
+++ b/setup.py Sat Apr 16 18:30:20 2022 +0200
@@ -56,7 +56,6 @@
requires = ['geomet', get_require_version('trytond'), 'psycopg2 >= 2.0.14']
-tests_require = []
dependency_links = []
if minor_version % 2:
dependency_links.append(
@@ -106,7 +105,4 @@
},
dependency_links=dependency_links,
zip_safe=False,
- test_suite='trytond.tests',
- test_loader='trytond.test_loader:Loader',
- tests_require=tests_require,
)
diff -r f212aff3ba77 -r 36180eeeff8e tox.ini
--- a/tox.ini Wed Apr 06 23:37:45 2022 +0200
+++ b/tox.ini Sat Apr 16 18:30:20 2022 +0200
@@ -3,7 +3,8 @@
[testenv]
commands =
- coverage run setup.py test
+ coverage run -m unittest discover -s trytond.tests
+ coverage run -a -m unittest discover -s trytond_gis.tests
coverage report --include=./trytond_gis/* --omit=*/tests/*
deps = coverage
setenv =
diff -r f212aff3ba77 -r 36180eeeff8e trytond_gis/tests/__init__.py
--- a/trytond_gis/tests/__init__.py Wed Apr 06 23:37:45 2022 +0200
+++ b/trytond_gis/tests/__init__.py Sat Apr 16 18:30:20 2022 +0200
@@ -3,10 +3,9 @@
from trytond.pool import Pool
-from . import gis
-
def register(name):
+ from . import gis
Pool.register(
gis.Point,
module=name, type_='model')
diff -r f212aff3ba77 -r 36180eeeff8e trytond_gis/tests/test_fields.py
--- a/trytond_gis/tests/test_fields.py Wed Apr 06 23:37:45 2022 +0200
+++ b/trytond_gis/tests/test_fields.py Sat Apr 16 18:30:20 2022 +0200
@@ -98,10 +98,3 @@
self.assertEqual(len(points), 3)
for point in points:
self.assertIsNotNone(point.point)
-
-
-def suite():
- suite_ = unittest.TestSuite()
- suite_.addTests(unittest.TestLoader().loadTestsFromTestCase(
- TestGeographicFields))
- return suite_
