changeset 7220e7a053ba in modules/purchase_shipment_cost:default
details: 
https://hg.tryton.org/modules/purchase_shipment_cost?cmd=changeset&node=7220e7a053ba
description:
        Replace test setuptools command by unittest discover

        issue9215
        review389851002
diffstat:

 setup.py                             |   4 +--
 tests/__init__.py                    |   8 -------
 tests/test_module.py                 |  13 +++++++++++
 tests/test_purchase_shipment_cost.py |  41 ------------------------------------
 tests/test_scenario.py               |  22 +++++++++++++++++++
 tox.ini                              |   3 +-
 6 files changed, 38 insertions(+), 53 deletions(-)

diffs (135 lines):

diff -r c3acd50748ba -r 7220e7a053ba setup.py
--- a/setup.py  Tue Apr 12 20:28:14 2022 +0200
+++ b/setup.py  Sat Apr 16 18:30:18 2022 +0200
@@ -74,6 +74,7 @@
     get_require_version('trytond_account_stock_continental'),
     get_require_version('trytond_account_stock_anglo_saxon'),
     get_require_version('trytond_purchase')]
+extras_require['test'] = tests_require
 dependency_links = []
 if minor_version % 2:
     dependency_links.append(
@@ -154,7 +155,4 @@
     [trytond.modules]
     purchase_shipment_cost = trytond.modules.purchase_shipment_cost
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff -r c3acd50748ba -r 7220e7a053ba tests/__init__.py
--- a/tests/__init__.py Tue Apr 12 20:28:14 2022 +0200
+++ b/tests/__init__.py Sat Apr 16 18:30:18 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.purchase_shipment_cost.tests.test_purchase_shipment_cost import 
\
-        suite  # noqa: E501
-except ImportError:
-    from .test_purchase_shipment_cost import suite
-
-__all__ = ['suite']
diff -r c3acd50748ba -r 7220e7a053ba tests/test_module.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_module.py      Sat Apr 16 18:30:18 2022 +0200
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# 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 PurchaseShipmentCostTestCase(ModuleTestCase):
+    'Test Purchase Shipment Cost module'
+    module = 'purchase_shipment_cost'
+
+
+del ModuleTestCase
diff -r c3acd50748ba -r 7220e7a053ba tests/test_purchase_shipment_cost.py
--- a/tests/test_purchase_shipment_cost.py      Tue Apr 12 20:28:14 2022 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-# 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 PurchaseShipmentCostTestCase(ModuleTestCase):
-    'Test Purchase Shipment Cost module'
-    module = 'purchase_shipment_cost'
-
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-        PurchaseShipmentCostTestCase))
-    suite.addTests(doctest.DocFileSuite('scenario_purchase_shipment_cost.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_purchase_shipment_cost_invoice_stock.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_purchase_shipment_cost_with_account_stock.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_purchase_shipment_cost_'
-            'with_account_stock_anglo_saxon.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
diff -r c3acd50748ba -r 7220e7a053ba tests/test_scenario.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_scenario.py    Sat Apr 16 18:30:18 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 c3acd50748ba -r 7220e7a053ba tox.ini
--- a/tox.ini   Tue Apr 12 20:28:14 2022 +0200
+++ b/tox.ini   Sat Apr 16 18:30:18 2022 +0200
@@ -2,8 +2,9 @@
 envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
 
 [testenv]
+extras = test
 commands =
-    coverage run --include=.*/purchase_shipment_cost/* setup.py test
+    coverage run --include=.*/purchase_shipment_cost/* -m unittest discover -s 
tests
     coverage report --include=.*/purchase_shipment_cost/* --omit=*/tests/*
 deps =
     coverage

Reply via email to