From 027e3810154a3bf1cb9df82125c367dcee49f4d0e58c74d80a772549547a7495 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 22 Dec 2020 22:29:19 +0000 Subject: [PATCH 1/2] - Adjust metadata for skip-networked-test.patch and refer to the proper upstream ticket gh#pyca/pyopenssl#68. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=78 --- python-pyOpenSSL.changes | 6 ++++++ python-pyOpenSSL.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index b74fc6a..250b484 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 22 22:28:30 UTC 2020 - Matej Cepl + +- Adjust metadata for skip-networked-test.patch and refer to the proper + upstream ticket gh#pyca/pyopenssl#68. + ------------------------------------------------------------------- Fri Dec 11 13:21:19 UTC 2020 - Matej Cepl diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 7fb6e2c..15de440 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -25,7 +25,9 @@ Summary: Python wrapper module around the OpenSSL library License: Apache-2.0 URL: https://github.com/pyca/pyopenssl Source: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz -Patch1: skip-networked-test.patch +# PATCH-FIX-UPSTREAM skip-networked-test.patch gh#pyca/pyopenssl#68 mcepl@suse.com +# Mark tests requiring network access +Patch0: skip-networked-test.patch BuildRequires: %{python_module cffi} BuildRequires: %{python_module cryptography >= 2.8} BuildRequires: %{python_module flaky} From b1fe3cd1e5ac1bc4c4c0f30a28850fbc12f49fe0cdad04dbf65bab824999a3d0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 22 Dec 2020 22:40:09 +0000 Subject: [PATCH 2/2] Adjust ignoring tests by pytest OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=79 --- python-pyOpenSSL.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 15de440..2028ff9 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -73,10 +73,10 @@ other things) a cffi-based interface to OpenSSL. %check SKIPPED_TESTS="network" %if %{__isa_bits} == 32 -SKIPPED_TESTS="$SKIPPED_TESTS or test_verify_with_time" +SKIPPED_TESTS="(network or test_verify_with_time)" %endif export LC_ALL=en_US.UTF-8 -%pytest -k "not ($SKIPPED_TESTS)" +%pytest -k "not $SKIPPED_TESTS" %files %{python_files} %license LICENSE