changeset dd98325461b6 in modules/carrier_percentage:default
details:
https://hg.tryton.org/modules/carrier_percentage?cmd=changeset&node=dd98325461b6
description:
Replace test setuptools command by unittest discover
issue9215
review389851002
diffstat:
setup.py | 6 +-
tests/__init__.py | 8 ----
tests/test_carrier_percentage.py | 70 ----------------------------------------
tests/test_module.py | 58 +++++++++++++++++++++++++++++++++
tests/test_scenario.py | 22 ++++++++++++
tox.ini | 3 +-
6 files changed, 85 insertions(+), 82 deletions(-)
diffs (210 lines):
diff -r c111e7c88cbc -r dd98325461b6 setup.py
--- a/setup.py Sun Apr 10 19:11:38 2022 +0200
+++ b/setup.py Sat Apr 16 18:30:17 2022 +0200
@@ -142,13 +142,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_percentage = trytond.modules.carrier_percentage
""",
- test_suite='tests',
- test_loader='trytond.test_loader:Loader',
- tests_require=tests_require,
)
diff -r c111e7c88cbc -r dd98325461b6 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_percentage.tests.test_carrier_percentage
import \
- suite # noqa: E501
-except ImportError:
- from .test_carrier_percentage import suite
-
-__all__ = ['suite']
diff -r c111e7c88cbc -r dd98325461b6 tests/test_carrier_percentage.py
--- a/tests/test_carrier_percentage.py Sun Apr 10 19:11:38 2022 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +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 decimal import Decimal
-
-import trytond.tests.test_tryton
-from trytond.modules.currency.tests import create_currency
-from trytond.pool import Pool
-from trytond.tests.test_tryton import (
- ModuleTestCase, doctest_checker, doctest_teardown, with_transaction)
-
-
-class CarrierPercentageTestCase(ModuleTestCase):
- 'Test CarrierPercentage module'
- module = 'carrier_percentage'
- extras = [
- 'purchase_shipment_cost', 'sale_shipment_cost', 'stock_shipment_cost']
-
- @with_transaction()
- def test_compute_percentage(self):
- 'Test compute_percentage'
- pool = Pool()
- Party = pool.get('party.party')
- Uom = pool.get('product.uom')
- Template = pool.get('product.template')
- Product = pool.get('product.product')
- Carrier = pool.get('carrier')
-
- party, = Party.create([{
- 'name': 'Carrier',
- }])
- uom, = Uom.search([
- ('name', '=', 'Unit'),
- ])
- template, = Template.create([{
- 'name': 'Carrier',
- 'default_uom': uom.id,
- 'type': 'service',
- }])
- product, = Product.create([{
- 'template': template.id,
- }])
- currency = create_currency('cu1')
- carrier, = Carrier.create([{
- 'party': party.id,
- 'carrier_product': product.id,
- 'carrier_cost_method': 'percentage',
- 'percentage': Decimal(15),
- }])
- for amount, price in [
- (Decimal(0), Decimal(0)),
- (Decimal(100), Decimal('15.00')),
- (Decimal(150), Decimal('22.50')),
- ]:
- self.assertEqual(
- carrier.compute_percentage(amount, currency.id),
- (price, currency.id))
-
-
-def suite():
- suite = trytond.tests.test_tryton.suite()
- suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
- CarrierPercentageTestCase))
- suite.addTests(doctest.DocFileSuite(
- 'scenario_carrier_percentage_with_purchase_shipment_cost.rst',
- tearDown=doctest_teardown, encoding='utf-8',
- checker=doctest_checker,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
- return suite
diff -r c111e7c88cbc -r dd98325461b6 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,58 @@
+# 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 decimal import Decimal
+
+from trytond.modules.currency.tests import create_currency
+from trytond.pool import Pool
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+
+
+class CarrierPercentageTestCase(ModuleTestCase):
+ 'Test CarrierPercentage module'
+ module = 'carrier_percentage'
+ extras = [
+ 'purchase_shipment_cost', 'sale_shipment_cost', 'stock_shipment_cost']
+
+ @with_transaction()
+ def test_compute_percentage(self):
+ 'Test compute_percentage'
+ pool = Pool()
+ Party = pool.get('party.party')
+ Uom = pool.get('product.uom')
+ Template = pool.get('product.template')
+ Product = pool.get('product.product')
+ Carrier = pool.get('carrier')
+
+ party, = Party.create([{
+ 'name': 'Carrier',
+ }])
+ uom, = Uom.search([
+ ('name', '=', 'Unit'),
+ ])
+ template, = Template.create([{
+ 'name': 'Carrier',
+ 'default_uom': uom.id,
+ 'type': 'service',
+ }])
+ product, = Product.create([{
+ 'template': template.id,
+ }])
+ currency = create_currency('cu1')
+ carrier, = Carrier.create([{
+ 'party': party.id,
+ 'carrier_product': product.id,
+ 'carrier_cost_method': 'percentage',
+ 'percentage': Decimal(15),
+ }])
+ for amount, price in [
+ (Decimal(0), Decimal(0)),
+ (Decimal(100), Decimal('15.00')),
+ (Decimal(150), Decimal('22.50')),
+ ]:
+ self.assertEqual(
+ carrier.compute_percentage(amount, currency.id),
+ (price, currency.id))
+
+
+del ModuleTestCase
diff -r c111e7c88cbc -r dd98325461b6 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 c111e7c88cbc -r dd98325461b6 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_percentage/* setup.py test
+ coverage run --include=.*/carrier_percentage/* -m unittest discover -s
tests
coverage report --include=.*/carrier_percentage/* --omit=*/tests/*
deps =
coverage
