From 72f5012be5c4861f29ea45a914cbce099ce90f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 28 Dec 2023 23:00:52 +0100 Subject: [PATCH] Set ELLIPSIS option flag on doctest Closes #12877 --- .../account_es/tests/scenario_reporting.rst | 20 +++++++++---------- .../tests/scenario_reporting_compensate.rst | 4 ++-- .../scenario_reporting_surcharge_tax.rst | 4 ++-- .../tests/scenario_account_payment_stripe.rst | 4 ++-- .../tests/scenario_shipping_dpd.rst | 4 ++-- ...nario_stock_package_shipping_sendcloud.rst | 4 ++-- .../tests/scenario_shipping_ups.rst | 4 ++-- trytond/CHANGELOG | 1 + trytond/trytond/tests/test_tryton.py | 2 +- 9 files changed, 24 insertions(+), 23 deletions(-) diff --git a/modules/account_es/tests/scenario_reporting.rst b/modules/account_es/tests/scenario_reporting.rst index 37f9aa4785..5054e2cf5d 100644 --- a/modules/account_es/tests/scenario_reporting.rst +++ b/modules/account_es/tests/scenario_reporting.rst @@ -170,8 +170,8 @@ Generate aeat reports:: >>> with file_open('account_es/tests/111.txt') as f: ... content == f.read() True - >>> name.startswith('AEAT Model 111') - True + >>> name + 'AEAT Model 111-2018-01' >>> aeat = Wizard('account.reporting.aeat') >>> aeat.form.report = '115' @@ -184,8 +184,8 @@ Generate aeat reports:: >>> with file_open('account_es/tests/115.txt') as f: ... content == f.read() True - >>> name.startswith('AEAT Model 115') - True + >>> name + 'AEAT Model 115-2018-01' >>> aeat = Wizard('account.reporting.aeat') >>> aeat.form.report = '303' @@ -197,8 +197,8 @@ Generate aeat reports:: >>> with file_open('account_es/tests/303.txt') as f: ... content == f.read() True - >>> name.startswith('AEAT Model 303') - True + >>> name + 'AEAT Model 303-2018-01' >>> VatList = Model.get('account.reporting.vat_list_es') >>> context = { @@ -214,8 +214,8 @@ Generate aeat reports:: >>> with file_open('account_es/tests/347.txt') as f: ... content == f.read() True - >>> name.startswith('AEAT Model 347') - True + >>> name + 'AEAT Model 347-...' >>> ECOperationList = Model.get('account.reporting.es_ec_operation_list') >>> context = { @@ -232,8 +232,8 @@ Generate aeat reports:: >>> with file_open('account_es/tests/349.txt') as f: ... content == f.read() True - >>> name.startswith('AEAT Model 349') - True + >>> name + 'AEAT Model 349-...' Only one tax of intracomunitary invoices is included on VAT Book:: diff --git a/modules/account_es/tests/scenario_reporting_compensate.rst b/modules/account_es/tests/scenario_reporting_compensate.rst index cac570b6bc..7c56e59db3 100644 --- a/modules/account_es/tests/scenario_reporting_compensate.rst +++ b/modules/account_es/tests/scenario_reporting_compensate.rst @@ -133,5 +133,5 @@ Generate aeat 303 report:: >>> with file_open('account_es/tests/303_compensate.txt') as f: ... content == f.read() True - >>> name.startswith('AEAT Model 303') - True + >>> name + 'AEAT Model 303-2018-02' diff --git a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst index 855d950e42..e355aadb67 100644 --- a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst +++ b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst @@ -137,7 +137,7 @@ Generate VAT Book:: >>> with file_open('account_es/tests/vat_book.csv', 'rb') as f: ... content == f.read() True - >>> name.startswith('VAT Book') - True + >>> name + 'VAT Book-...' >>> extension 'csv' diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst index 9b954f80af..a35f709f29 100644 --- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst +++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst @@ -219,8 +219,8 @@ Make payment with customer:: >>> payment.save() >>> _, source = Payment.get_stripe_customer_sources(payment.id, config.context) >>> source_id, source_name = source - >>> source_name == 'Visa ****1881 12/%s' % (today.year + 1) - True + >>> source_name + 'Visa ****1881 12/...' >>> payment.stripe_customer_source = source_id >>> payment.click('submit') >>> payment.state diff --git a/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst b/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst index 0e0f96a364..302c5bba07 100644 --- a/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst +++ b/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst @@ -221,7 +221,7 @@ Create the packs and ship the shipment:: 'application/pdf' >>> pack.shipping_reference is not None True - >>> pack.shipping_tracking_url.startswith('https://tracking.dpd.de/status/') - True + >>> pack.shipping_tracking_url + 'https://tracking.dpd.de/status/...' >>> pack.shipping_tracking_url.endswith(pack.shipping_reference) True diff --git a/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst b/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst index 99f64f471f..ac88cd3191 100644 --- a/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst +++ b/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst @@ -223,8 +223,8 @@ Create the packages and ship the shipment:: 'application/pdf' >>> pack.shipping_reference is not None True - >>> pack.shipping_tracking_url.startswith('http') - True + >>> pack.shipping_tracking_url + 'http...' Clean up:: diff --git a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst index 20f66b97ef..820f9cf852 100644 --- a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst +++ b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst @@ -227,8 +227,8 @@ Create the packs and ship the shipment:: 'image/gif' >>> pack.shipping_reference is not None True - >>> pack.shipping_tracking_url.startswith('https://www.ups.com/track?') - True + >>> pack.shipping_tracking_url + 'https://www.ups.com/track?...' >>> pack.shipping_reference in pack.shipping_tracking_url True diff --git a/trytond/CHANGELOG b/trytond/CHANGELOG index 70aa9aca8e..ed9d6587f1 100644 --- a/trytond/CHANGELOG +++ b/trytond/CHANGELOG @@ -1,3 +1,4 @@ +* Set ELLIPSIS option flag on doctest * Set IGNORE_EXCEPTION_DETAIL option flag on doctest * Add timeout parameter on RPC definitions diff --git a/trytond/trytond/tests/test_tryton.py b/trytond/trytond/tests/test_tryton.py index 32ff5d8d63..a4f776c85c 100644 --- a/trytond/trytond/tests/test_tryton.py +++ b/trytond/trytond/tests/test_tryton.py @@ -1126,7 +1126,7 @@ def load_doc_tests(name, path, loader, tests, pattern): tearDown=doctest_teardown, encoding='utf-8', checker=doctest_checker, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE - | doctest.IGNORE_EXCEPTION_DETAIL)) + | doctest.ELLIPSIS | doctest.IGNORE_EXCEPTION_DETAIL)) finally: os.chdir(cwd) return tests