From 8ef2cc99441fab7c9dc963df00f42f47dd3e1009c8e23a89886256756175fd1d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Jun 2017 11:58:36 +0000 Subject: [PATCH] Accepting request 503384 from openSUSE:Leap:15.0:Rings:1-MinimalX - exclude http2 and ssh tests if curl(-mini) doesn't support it See also bug 1042919 OBS-URL: https://build.opensuse.org/request/show/503384 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=27 --- python-pycurl.changes | 5 +++++ python-pycurl.spec | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/python-pycurl.changes b/python-pycurl.changes index f69fda3..70aed52 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/python-pycurl.spec b/python-pycurl.spec index 22bc720..e2f89ed 100644 --- a/python-pycurl.spec +++ b/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='!online' +if ! pkg-config --variable=supported_features libcurl|grep -qw HTTP2; then + test_flags="$test_flags,\!http2" +fi +if ! pkg-config --variable=supported_protocols libcurl|grep -qw SCP; then + test_flags="$test_flags,\!ssh" +fi %{python_expand PYTHONPATH=$(ls -d build/lib.*) \ - nosetests-%$python_bin_suffix --with-flaky -a '!online' $EXCLUDES} + nosetests-%$python_bin_suffix --with-flaky -a "$test_flags"} %files %{python_files} %defattr(-,root,root,-)