File project.diff of Package python-pycurl

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package python-pycurl (Revision 83bed6bd4be62636300e0934867f20a6)

Currently displaying revision 83bed6bd4be62636300e0934867f20a6 , Show latest

--- python-pycurl.changes.orig
+++ python-pycurl.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu Jun  8 16:15:49 UTC 2017 - lnussel@suse.de
+
+- exclude http2 and ssh tests if curl(-mini) doesn't support it
+
+-------------------------------------------------------------------
 Tue Dec 20 15:55:00 UTC 2016 - jmatejek@suse.com
 
 - update for multipython build
--- python-pycurl.spec.orig
+++ python-pycurl.spec
@@ -83,13 +83,16 @@ pushd tests/fake-curl/libcurl
 rm -f *.so
 make
 popd
-EXCLUDES=""
-%if 0%{?suse_version} < 1320
-# CURL too old to know HTTP/2
-EXCLUDES="-e test_http_version_2_0"
-%endif
+# exclude certain tests
+test_flags=(-a '!online')
+if ! pkg-config --variable=supported_features libcurl|grep -qw HTTP2; then
+    test_flags+=(-a '!http2')
+fi
+if ! pkg-config --variable=supported_features libcurl|grep -qw SCP; then
+    test_flags+=(-a '!ssh')
+fi
 %{python_expand PYTHONPATH=$(ls -d build/lib.*) \
-    nosetests-%$python_bin_suffix --with-flaky -a '!online' $EXCLUDES}
+    nosetests-%$python_bin_suffix --with-flaky "${test_flags[@]}"}
 
 %files %{python_files}
 %defattr(-,root,root,-)

Places

File project.diff of Package python-pycurl (Revision 83bed6bd4be62636300e0934867f20a6)

Places