Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-vncdotool for
openSUSE:Factory checked in at 2021-11-04 16:16:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-vncdotool (Old)
and /work/SRC/openSUSE:Factory/.python-vncdotool.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-vncdotool"
Thu Nov 4 16:16:18 2021 rev:3 rq:928446 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-vncdotool/python-vncdotool.changes
2021-10-20 20:23:53.609363601 +0200
+++
/work/SRC/openSUSE:Factory/.python-vncdotool.new.1890/python-vncdotool.changes
2021-11-04 16:16:26.893287879 +0100
@@ -1,0 +2,9 @@
+Mon Nov 1 04:47:41 UTC 2021 - Steve Kowalik <[email protected]>
+
+- Add patch remove-nose.patch:
+ * Stop requiring nose for the test suite.
+- Add patch fix-mocking.patch:
+ * Use correct form of mocking for a UNIX domain socket test.
+- Use pytest to run the test suite.
+
+-------------------------------------------------------------------
New:
----
fix-mocking.patch
remove-nose.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-vncdotool.spec ++++++
--- /var/tmp/diff_new_pack.McYmio/_old 2021-11-04 16:16:27.341288141 +0100
+++ /var/tmp/diff_new_pack.McYmio/_new 2021-11-04 16:16:27.345288143 +0100
@@ -23,9 +23,10 @@
Release: 0
Summary: Command line VNC client
License: MIT
-Group: Development/Languages/Python
URL: https://github.com/sibson/vncdotool
Source:
https://files.pythonhosted.org/packages/source/v/vncdotool/vncdotool-%{version}.tar.gz
+Patch0: remove-nose.patch
+Patch1: fix-mocking.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -38,8 +39,8 @@
BuildRequires: %{python_module Pillow}
BuildRequires: %{python_module Twisted}
BuildRequires: %{python_module mock}
-BuildRequires: %{python_module nose}
BuildRequires: %{python_module pexpect}
+BuildRequires: %{python_module pytest}
# /SECTION
%python_subpackages
@@ -48,6 +49,7 @@
%prep
%setup -q -n vncdotool-%{version}
+%autopatch -p1
sed -i 's/from unittest.mock import /from mock.mock import /'
tests/unit/helpers.py
%build
@@ -71,7 +73,7 @@
%python_uninstall_alternative vnclog
%check
-%python_exec setup.py test
+%pytest -k 'not functional'
%files %{python_files}
%doc README.rst
++++++ fix-mocking.patch ++++++
Index: vncdotool-1.0.0/tests/unit/test_command.py
===================================================================
--- vncdotool-1.0.0.orig/tests/unit/test_command.py
+++ vncdotool-1.0.0/tests/unit/test_command.py
@@ -1,5 +1,6 @@
from vncdotool import command
+import os.path
import socket
import unittest
import mock
@@ -207,8 +208,8 @@ class TestParseServer(object):
assert port == 1111
def test_unix_socket(self):
- command.os.path.exists.return_value = True
- family, host, port = command.parse_server('/some/path/unix.skt')
+ with mock.patch.object(os.path, 'exists', return_value=True):
+ family, host, port = command.parse_server('/some/path/unix.skt')
assert family == socket.AF_UNIX
assert host == '/some/path/unix.skt'
assert port == 5900
++++++ remove-nose.patch ++++++
Index: vncdotool-1.0.0/tests/unit/test_client.py
===================================================================
--- vncdotool-1.0.0.orig/tests/unit/test_client.py
+++ vncdotool-1.0.0/tests/unit/test_client.py
@@ -1,6 +1,5 @@
-from unittest import TestCase
+from unittest import SkipTest, TestCase
-from nose.plugins.skip import SkipTest
import mock
from vncdotool import client
Index: vncdotool-1.0.0/setup.py
===================================================================
--- vncdotool-1.0.0.orig/setup.py
+++ vncdotool-1.0.0/setup.py
@@ -14,7 +14,6 @@ setup(
"Pillow",
],
tests_require=[
- 'nose',
'pexpect',
],
url='http://github.com/sibson/vncdotool',
