From 2c6e44f6afc3522b920673f1ffb4cd320be14c638283f9271a93a87ecb6a970a Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Fri, 11 Dec 2020 17:24:47 +0000
Subject: [PATCH] Accepting request 854961 from
 home:mcepl:branches:devel:tools:scm

- According to gh#pyca/pyopenssl#684 tests must run with TZ=UTC, also
  skip test_verify_with_time on %ix86.

OBS-URL: https://build.opensuse.org/request/show/854961
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=76
---
 python-pyOpenSSL.changes  |  6 ++++++
 python-pyOpenSSL.spec     |  9 ++++-----
 skip-networked-test.patch | 22 ++++++++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes
index a30cf89..b74fc6a 100644
--- a/python-pyOpenSSL.changes
+++ b/python-pyOpenSSL.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 11 13:21:19 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- According to gh#pyca/pyopenssl#684 tests must run with TZ=UTC, also
+  skip test_verify_with_time on %ix86.
+
 -------------------------------------------------------------------
 Wed Dec  9 16:41:15 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
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
+-