From ffd7dfa61f770acdd71109cd87ebc73f9a61b9532071f7cad6b229be905fd315 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 | 4 ++-- python-pyOpenSSL.spec | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index a4f9aab..52d8baa 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e2f3269ab62dd5fb10fbddf91a61a4f4558e65b2e9d542be12a166ce2568e55 -size 19171 +oid sha256:84d858ff793aa3b6717d86586ddc70e26db6ac318e7fa553f25da661b2bd96c7 +size 19412 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 977587994549a62fc52a2536afb08e9a0c5911fbcb76c07a24e93af873d1f1e7 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