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

        issue9215
        review389851002
diffstat:

 setup.py                             |   6 ++--
 tests/__init__.py                    |   8 -------
 tests/test_account_payment_stripe.py |  38 ------------------------------------
 tests/test_module.py                 |  12 +++++++++++
 tests/test_scenario.py               |  24 ++++++++++++++++++++++
 tox.ini                              |   3 +-
 6 files changed, 41 insertions(+), 50 deletions(-)

diffs (134 lines):

diff -r 050f32f04f09 -r 5ec61a30fe89 setup.py
--- a/setup.py  Mon Apr 11 23:24:20 2022 +0200
+++ b/setup.py  Sat Apr 16 18:30:16 2022 +0200
@@ -139,13 +139,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]
     account_payment_stripe = trytond.modules.account_payment_stripe
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff -r 050f32f04f09 -r 5ec61a30fe89 tests/__init__.py
--- a/tests/__init__.py Mon Apr 11 23:24:20 2022 +0200
+++ b/tests/__init__.py Sat Apr 16 18:30:16 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.account_payment_stripe.tests.test_account_payment_stripe import 
\
-        suite  # noqa: E501
-except ImportError:
-    from .test_account_payment_stripe import suite
-
-__all__ = ['suite']
diff -r 050f32f04f09 -r 5ec61a30fe89 tests/test_account_payment_stripe.py
--- a/tests/test_account_payment_stripe.py      Mon Apr 11 23:24:20 2022 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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 os
-import unittest
-
-from trytond.tests.test_tryton import (
-    ModuleTestCase, doctest_checker, doctest_teardown)
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class AccountPaymentStripeTestCase(ModuleTestCase):
-    'Test Account Payment Stripe module'
-    module = 'account_payment_stripe'
-
-
-def suite():
-    suite = test_suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            AccountPaymentStripeTestCase))
-    if (os.getenv('STRIPE_SECRET_KEY')
-            and os.getenv('STRIPE_PUBLISHABLE_KEY')):
-        suite.addTests(doctest.DocFileSuite(
-                'scenario_account_payment_stripe.rst',
-                tearDown=doctest_teardown, encoding='utf-8',
-                checker=doctest_checker,
-                optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-        suite.addTests(doctest.DocFileSuite(
-                'scenario_account_payment_stripe_dispute.rst',
-                tearDown=doctest_teardown, encoding='utf-8',
-                checker=doctest_checker,
-                optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-        suite.addTests(doctest.DocFileSuite(
-                'scenario_account_payment_stripe_intent.rst',
-                tearDown=doctest_teardown, encoding='utf-8',
-                checker=doctest_checker,
-                optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
diff -r 050f32f04f09 -r 5ec61a30fe89 tests/test_module.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_module.py      Sat Apr 16 18:30:16 2022 +0200
@@ -0,0 +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.
+
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class AccountPaymentStripeTestCase(ModuleTestCase):
+    'Test Account Payment Stripe module'
+    module = 'account_payment_stripe'
+
+
+del ModuleTestCase
diff -r 050f32f04f09 -r 5ec61a30fe89 tests/test_scenario.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_scenario.py    Sat Apr 16 18:30:16 2022 +0200
@@ -0,0 +1,24 @@
+# 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):
+    if (os.getenv('STRIPE_SECRET_KEY')
+            and os.getenv('STRIPE_PUBLISHABLE_KEY')):
+        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 050f32f04f09 -r 5ec61a30fe89 tox.ini
--- a/tox.ini   Mon Apr 11 23:24:20 2022 +0200
+++ b/tox.ini   Sat Apr 16 18:30:16 2022 +0200
@@ -2,8 +2,9 @@
 envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
 
 [testenv]
+extras = test
 commands =
-    coverage run --include=.*/account_payment_stripe/* setup.py test
+    coverage run --include=.*/account_payment_stripe/* -m unittest discover -s 
tests
     coverage report --include=.*/account_payment_stripe/* --omit=*/tests/*
 deps =
     coverage

Reply via email to