From df40eaf988753cf3d20a88b377e46c756663e6a59b41c4e4cbc40c5fb840a737 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Tue, 9 May 2023 22:41:58 +0000
Subject: [PATCH] Accepting request 1085679 from
 home:dgarcia:branches:devel:languages:python

- Disable broken tests because python-requests-mock and urllib3
  compatibility, gh#jamielennox/requests-mock#228

OBS-URL: https://build.opensuse.org/request/show/1085679
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-apache-libcloud?expand=0&rev=128
---
 python-apache-libcloud.changes |  6 ++++++
 python-apache-libcloud.spec    | 31 ++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/python-apache-libcloud.changes b/python-apache-libcloud.changes
index 870261c..bf0ebea 100644
--- a/python-apache-libcloud.changes
+++ b/python-apache-libcloud.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May  9 10:36:53 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Disable broken tests because python-requests-mock and urllib3
+  compatibility, gh#jamielennox/requests-mock#228
+
 -------------------------------------------------------------------
 Sat Jan 28 12:27:20 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-apache-libcloud.spec b/python-apache-libcloud.spec
index c42145e..8fd61fc 100644
--- a/python-apache-libcloud.spec
+++ b/python-apache-libcloud.spec
@@ -18,7 +18,6 @@
 
 # No longer build for python2
 %define skip_python2 1
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-apache-libcloud
 Version:        3.7.0
 Release:        0
@@ -80,10 +79,36 @@ find %{buildroot} -name '*.pem' -size 0 -delete
 
 %check
 # Skip OvhTests::test_list_nodes_invalid_region which tries to reach OVH servers
-# Skip ShellOutSSHClientTests tests which attempt to ssh to localhost
+donttest="test_consume_stderr_chunk_contains_part_of_multi_byte_utf8_character"
+donttest+=" or test_consume_stdout_chunk_contains_part_of_multi_byte_utf8_character"
+donttest+=" or test_consume_stdout_chunk_contains_non_utf8_character"
+donttest+=" or test_consume_stderr_chunk_contains_non_utf8_character"
 # Skip test_key_file_non_pem_format_error since OpenSSH support is backported for SLE python-paramiko < 2.7.0
+donttest+=" or test_key_file_non_pem_format_error"
+# Skip ShellOutSSHClientTests tests which attempt to ssh to localhost
+donttest+=" or ShellOutSSHClientTests"
 # Note these four extra py3 failures are undesirable and should be fixed: fail in s390 and ppc64
-%pytest -k '(not test_consume_stderr_chunk_contains_part_of_multi_byte_utf8_character and not test_consume_stdout_chunk_contains_part_of_multi_byte_utf8_character and not test_consume_stdout_chunk_contains_non_utf8_character and not test_consume_stderr_chunk_contains_non_utf8_character and not test_key_file_non_pem_format_error and not ShellOutSSHClientTests and not ElasticContainerDriverTestCase and not test_list_nodes_invalid_region and not test_connection_timeout_raised and not test_retry_on_all_default_retry_exception_classes)'
+donttest+=" or ElasticContainerDriverTestCase"
+donttest+=" or test_list_nodes_invalid_region"
+donttest+=" or test_connection_timeout_raised"
+donttest+=" or test_retry_on_all_default_retry_exception_classes"
+
+# Skip tests broken because requests-mock incompatibility with urllib3 >= 2.0.0
+# gh#jamielennox/requests-mock#228
+donttest+=" or test_openstack.py"
+donttest+=" or test_rackspace.py"
+donttest+=" or test_scaleway.py"
+donttest+=" or test_vcloud.py"
+donttest+=" or test_vultr_v2.py"
+donttest+=" or test_aurora.py"
+donttest+=" or test_azure_blobs.py"
+donttest+=" or test_cloudfiles.py"
+donttest+=" or test_google_storage.py"
+donttest+=" or test_oss.py"
+donttest+=" or test_ovh.py"
+donttest+=" or test_s3.py"
+
+%pytest -k "not ($donttest)"
 
 %files %{python_files}
 %license LICENSE