Replace test setuptools command by unittest discover
issue9215 review389851002
This commit is contained in:
@@ -146,6 +146,7 @@ setup(name=name,
|
||||
'data': [
|
||||
'pycountry', 'forex-python', get_require_version('proteus')],
|
||||
'ecb_rate': ['forex-python'],
|
||||
'test': tests_require,
|
||||
},
|
||||
dependency_links=dependency_links,
|
||||
zip_safe=False,
|
||||
@@ -155,7 +156,4 @@ setup(name=name,
|
||||
[console_scripts]
|
||||
trytond_import_currencies = trytond.modules.currency.scripts.import_currencies:run [data]
|
||||
""", # noqa: E501
|
||||
test_suite='tests',
|
||||
test_loader='trytond.test_loader:Loader',
|
||||
tests_require=tests_require,
|
||||
)
|
||||
|
||||
+2
-6
@@ -1,10 +1,6 @@
|
||||
# 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.currency.tests.test_currency import (
|
||||
add_currency_rate, create_currency, suite)
|
||||
except ImportError:
|
||||
from .test_currency import add_currency_rate, create_currency, suite
|
||||
from .test_module import add_currency_rate, create_currency
|
||||
|
||||
__all__ = ['suite', 'create_currency', 'add_currency_rate']
|
||||
__all__ = ['create_currency', 'add_currency_rate']
|
||||
|
||||
@@ -1,15 +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.
|
||||
|
||||
import datetime
|
||||
import doctest
|
||||
import unittest
|
||||
from decimal import Decimal
|
||||
|
||||
import trytond.tests.test_tryton
|
||||
from trytond import backend
|
||||
from trytond.pool import Pool
|
||||
from trytond.tests.test_tryton import (
|
||||
ModuleTestCase, doctest_checker, doctest_teardown, with_transaction)
|
||||
from trytond.tests.test_tryton import ModuleTestCase, with_transaction
|
||||
from trytond.transaction import Transaction
|
||||
|
||||
|
||||
@@ -373,23 +370,4 @@ class CurrencyTestCase(ModuleTestCase):
|
||||
self.assertSetEqual(data, result)
|
||||
|
||||
|
||||
def suite():
|
||||
suite = trytond.tests.test_tryton.suite()
|
||||
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
|
||||
CurrencyTestCase))
|
||||
suite.addTests(doctest.DocFileSuite(
|
||||
'scenario_currency_compute.rst',
|
||||
tearDown=doctest_teardown, encoding='utf-8',
|
||||
checker=doctest_checker,
|
||||
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
|
||||
suite.addTests(doctest.DocFileSuite(
|
||||
'scenario_currency_import.rst',
|
||||
tearDown=doctest_teardown, encoding='utf-8',
|
||||
checker=doctest_checker,
|
||||
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
|
||||
suite.addTests(doctest.DocFileSuite(
|
||||
'scenario_currency_rate_update.rst',
|
||||
tearDown=doctest_teardown, encoding='utf-8',
|
||||
checker=doctest_checker,
|
||||
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
|
||||
return suite
|
||||
del ModuleTestCase
|
||||
@@ -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
|
||||
@@ -2,8 +2,9 @@
|
||||
envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
|
||||
|
||||
[testenv]
|
||||
extras = test
|
||||
commands =
|
||||
coverage run --include=.*/currency/* setup.py test
|
||||
coverage run --include=.*/currency/* -m unittest discover -s tests
|
||||
coverage report --include=.*/currency/* --omit=*/tests/*
|
||||
deps =
|
||||
coverage
|
||||
|
||||
Reference in New Issue
Block a user