changeset 683d6f571eb1 in modules/attendance:default
details:
https://hg.tryton.org/modules/attendance?cmd=changeset&node=683d6f571eb1
description:
Replace test setuptools command by unittest discover
issue9215
review389851002
diffstat:
setup.py | 4 +---
tests/__init__.py | 8 --------
tests/test_attendance.py | 34 ----------------------------------
tests/test_module.py | 14 ++++++++++++++
tests/test_scenario.py | 22 ++++++++++++++++++++++
tox.ini | 3 ++-
6 files changed, 39 insertions(+), 46 deletions(-)
diffs (129 lines):
diff -r 4af12275a6a5 -r 683d6f571eb1 setup.py
--- a/setup.py Mon Apr 11 23:24:21 2022 +0200
+++ b/setup.py Sat Apr 16 18:30:17 2022 +0200
@@ -142,6 +142,7 @@
python_requires='>=3.7',
install_requires=requires,
extras_require={
+ 'test': tests_require,
'timezone': ['pytz'],
},
dependency_links=dependency_links,
@@ -150,7 +151,4 @@
[trytond.modules]
attendance = trytond.modules.attendance
""",
- test_suite='tests',
- test_loader='trytond.test_loader:Loader',
- tests_require=tests_require,
)
diff -r 4af12275a6a5 -r 683d6f571eb1 tests/__init__.py
--- a/tests/__init__.py Mon Apr 11 23:24:21 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.attendance.tests.test_attendance import \
- suite # noqa: E501
-except ImportError:
- from .test_attendance import suite
-
-__all__ = ['suite']
diff -r 4af12275a6a5 -r 683d6f571eb1 tests/test_attendance.py
--- a/tests/test_attendance.py Mon Apr 11 23:24:21 2022 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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.modules.company.tests import CompanyTestMixin
-from trytond.tests.test_tryton import (
- ModuleTestCase, doctest_checker, doctest_teardown)
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class CompanyAttendanceTestCase(CompanyTestMixin, ModuleTestCase):
- 'Test Company Attendance module'
- module = 'attendance'
- extras = ['timesheet']
-
-
-def suite():
- suite = test_suite()
- suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
- CompanyAttendanceTestCase))
- suite.addTests(doctest.DocFileSuite('scenario_attendance.rst',
- tearDown=doctest_teardown, encoding='utf-8',
- checker=doctest_checker,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
- suite.addTests(doctest.DocFileSuite('scenario_attendance_sheet.rst',
- tearDown=doctest_teardown, encoding='utf-8',
- checker=doctest_checker,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
- suite.addTests(doctest.DocFileSuite('scenario_attendance_timesheet.rst',
- tearDown=doctest_teardown, encoding='utf-8',
- checker=doctest_checker,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
- return suite
diff -r 4af12275a6a5 -r 683d6f571eb1 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,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 CompanyAttendanceTestCase(CompanyTestMixin, ModuleTestCase):
+ 'Test Company Attendance module'
+ module = 'attendance'
+ extras = ['timesheet']
+
+
+del ModuleTestCase
diff -r 4af12275a6a5 -r 683d6f571eb1 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 4af12275a6a5 -r 683d6f571eb1 tox.ini
--- a/tox.ini Mon Apr 11 23:24:21 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=.*/attendance/* setup.py test
+ coverage run --include=.*/attendance/* -m unittest discover -s tests
coverage report --include=.*/attendance/* --omit=*/tests/*
deps =
coverage
