- Execute tests

- Switch to github tarball to get tests
- Add patch to fix tests on python 3.6+:
  * fix-tests-py3.6.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockify?expand=0&rev=34

fix-tests-py3.6.patch

@@ -0,0 +1,14 @@
+Index: websockify-0.8.0+dfsg1/tests/test_websocket.py
+===================================================================
+--- websockify-0.8.0+dfsg1.orig/tests/test_websocket.py
++++ websockify-0.8.0+dfsg1/tests/test_websocket.py
+@@ -69,6 +69,9 @@ class FakeSocket(object):
+         else:
+             return StringIO(self._data.decode('latin_1'))
+ 
++    def sendall(self, data, flags=None):
++        return len(data)
++
+ 
+ class WebSocketRequestHandlerTestCase(unittest.TestCase):
+     def setUp(self):

python-websockify.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 13 09:25:56 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Execute tests
+- Switch to github tarball to get tests
+- Add patch to fix tests on python 3.6+:
+  * fix-tests-py3.6.patch
+
 -------------------------------------------------------------------
 Tue Feb 12 14:34:16 UTC 2019 - Cédric Bosdonnat <cbosdonnat@suse.com>
 

python-websockify.spec

@@ -23,8 +23,8 @@ Release:        0
 Summary:        WebSocket to TCP proxy/bridge
 License:        LGPL-3.0-only AND MPL-2.0 AND BSD-2-Clause AND BSD-3-Clause
 Group:          Development/Languages/Python
-URL:            https://github.com/kanaka/websockify
+URL:            https://github.com/novnc/websockify
-Source:         https://files.pythonhosted.org/packages/source/w/websockify/websockify-%{version}.tar.gz
+Source:         https://github.com/novnc/websockify/archive/v%{version}.tar.gz
 # PATCH-FEATURE-UPSTREAM u_Add-support-for-inetd.patch fate#323880 msrb@suse.com -- https://github.com/novnc/websockify/pull/293
 Patch1:         u_Add-support-for-inetd.patch
 # PATCH-FEATURE-UPSTREAM u_Fix-inetd-mode-on-python-2.patch fate#323880 msrb@suse.com -- https://github.com/novnc/websockify/pull/293
@@ -33,17 +33,23 @@ Patch2:         u_Fix-inetd-mode-on-python-2.patch
 Patch3:         u_added_jwt_tokens_capability.patch
 # PATCH-FIX-OPENSUSE PyJWT-token-plugin.patch fate#325762 cbosdonnat@suse.com -- use PyJWT if jwcrypto is missing
 Patch4:         PyJWT-token-plugin.patch
+# PATCH-FROM-UPSTREAM:
+Patch5:         fix-tests-py3.6.patch
+BuildRequires:  %{python_module PyJWT}
+BuildRequires:  %{python_module cryptography}
+BuildRequires:  %{python_module mox3}
+BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module numpy}
 BuildRequires:  %{python_module setuptools}
+Requires:       python-numpy
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  unzip
 Requires:       python-setuptools
 Requires:       python-websockify-common = %{version}
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 BuildArch:      noarch
 %if 0%{?suse_version}
-Recommends:     python-numpy
-%endif
 # SLES 12 and up to 15SP1 doesn't have python-jwcrypto package and will fallback to
 # the PyJWT implementation. However opensuse has jwcrypto since 42.3: use this one
 # since it also provides support for JWE (encrypted JWT).
@@ -53,6 +59,7 @@ Recommends:     python-cryptography
 %else
 Recommends:     python-jwcrypto
 %endif
+%endif
 %python_subpackages
 
 %description
@@ -82,22 +89,28 @@ This package contains common files.
 
 %prep
 %setup -q -n websockify-%{version}
-%patch1 -p1
+%autopatch -p1
-%patch2 -p1
+
-%patch3 -p1
-%patch4 -p1
 # remove unwanted shebang
 sed -i '1 { /^#!/ d }' websockify/websocket*.py
 # drop unneeded executable bit
 chmod -x include/web-socket-js/web_socket.js
+# fix mox3 import
+sed -e 's:import stubout:from mox3 import stubout:g' \
+    -i tests/test_websocketproxy.py \
+    -i tests/test_websocket.py
 
 %build
 %python_build
 
 %install
 %python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 %python_clone -a %{buildroot}%{_bindir}/websockify
 
+%check
+%python_exec setup.py nosetests
+
 %post
 %python_install_alternative websockify
 

v0.8.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f080e40b3f429f39dc557c62c6d715a683100e7c10c557fa376b6dbde23358ce
+size 288359

websockify-0.8.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:547d3d98c5081f2dc2872a2e4a3aef33e0ee5141d5f6209204aab2f4a41548d2
-size 234450