diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index 51ee7da..a4f9aab 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67529ba791030eda641f16a1ce88816090486a8a0415f45e2e5adb40c7ec8f2f -size 18933 +oid sha256:7e2f3269ab62dd5fb10fbddf91a61a4f4558e65b2e9d542be12a166ce2568e55 +size 19171 diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 1669e62..7fb6e2c 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -69,13 +69,12 @@ other things) a cffi-based interface to OpenSSL. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -export LC_ALL=en_US.UTF-8 -# test_verify_with_time does not fit in 32 bits +SKIPPED_TESTS="network" %if %{__isa_bits} == 32 -%pytest -m 'not network' -k 'not test_verify_with_time' -%else -%pytest -m 'not network' +SKIPPED_TESTS="$SKIPPED_TESTS or test_verify_with_time" %endif +export LC_ALL=en_US.UTF-8 +%pytest -k "not ($SKIPPED_TESTS)" %files %{python_files} %license LICENSE diff --git a/skip-networked-test.patch b/skip-networked-test.patch index bba5594..7d219a6 100644 --- a/skip-networked-test.patch +++ b/skip-networked-test.patch @@ -1,7 +1,5 @@ -Index: pyOpenSSL-20.0.0/tests/test_ssl.py -=================================================================== ---- pyOpenSSL-20.0.0.orig/tests/test_ssl.py -+++ pyOpenSSL-20.0.0/tests/test_ssl.py +--- a/tests/test_ssl.py ++++ b/tests/test_ssl.py @@ -1240,6 +1240,7 @@ class TestContext(object): reason="set_default_verify_paths appears not to work on Windows. " "See LP#404343 and LP#404344.", @@ -10,3 +8,19 @@ Index: pyOpenSSL-20.0.0/tests/test_ssl.py def test_set_default_verify_paths(self): """ `Context.set_default_verify_paths` causes the platform-specific CA +--- a/setup.cfg ++++ b/setup.cfg +@@ -2,6 +2,8 @@ + minversion = 3.0.1 + strict = true + testpaths = tests ++markers = ++ network: test case requires network connection + + [bdist_wheel] + universal = 1 +@@ -19,4 +21,3 @@ doc-files = doc/_build/html + [egg_info] + tag_build = + tag_date = 0 +-