Hello community, here is the log from the commit of package python-pycurl for openSUSE:Factory checked in at 2017-06-29 14:59:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pycurl (Old) and /work/SRC/openSUSE:Factory/.python-pycurl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pycurl" Thu Jun 29 14:59:34 2017 rev:16 rq:505428 version:7.43.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pycurl/python-pycurl.changes 2017-04-28 10:39:28.396238968 +0200 +++ /work/SRC/openSUSE:Factory/.python-pycurl.new/python-pycurl.changes 2017-06-29 14:59:39.748108176 +0200 @@ -1,0 +2,11 @@ +Wed Jun 21 09:51:22 UTC 2017 - [email protected] + +- Add increase_test_timeout.diff so tests don't fail when obs is + overloaded and it takes more than 1 second to start a service. + +------------------------------------------------------------------- +Thu Jun 8 16:15:49 UTC 2017 - [email protected] + +- exclude http2 and ssh tests if curl(-mini) doesn't support it + +------------------------------------------------------------------- New: ---- increase_test_timeout.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pycurl.spec ++++++ --- /var/tmp/diff_new_pack.uZDaZ9/_old 2017-06-29 14:59:41.027927470 +0200 +++ /var/tmp/diff_new_pack.uZDaZ9/_new 2017-06-29 14:59:41.031926906 +0200 @@ -28,6 +28,8 @@ Source: https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-%{version}.tar.gz # PATCH-FIX-UPSTREAM remove __DATE__ and __TIME__ Patch0: pycurl-no-runtime-curlvercheck.patch +# PATCH-FIX-OPENSUSE increase_test_timeout.diff -- Increase the timeout in a test so it doesn't fail when obs is overloaded +Patch1: increase_test_timeout.diff BuildRequires: %{python_module CherryPy} BuildRequires: %{python_module bottle} BuildRequires: %{python_module devel} @@ -67,6 +69,7 @@ %prep %setup -q -n pycurl-%{version} %patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags}" @@ -83,13 +86,16 @@ 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,-) ++++++ increase_test_timeout.diff ++++++ Index: pycurl-7.43.0/tests/runwsgi.py =================================================================== --- pycurl-7.43.0.orig/tests/runwsgi.py +++ pycurl-7.43.0/tests/runwsgi.py @@ -55,10 +55,10 @@ def start_bottle_server(app, port, serve server_thread.daemon = True server_thread.start() - ok = util.wait_for_network_service(('127.0.0.1', port), 0.1, 10) + ok = util.wait_for_network_service(('127.0.0.1', port), 0.1, 30) if not ok: import warnings - warnings.warn('Server did not start after 1 second') + warnings.warn('Server did not start after 3 seconds') return server_thread.server
