[Python-modules-commits] [rpyc] 06/06: merge patched into master
Carl Suster
arcresu-guest at moszumanska.debian.org
Thu Jan 12 06:00:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
arcresu-guest pushed a commit to branch master
in repository rpyc.
commit 67d13c798678ccba6c1d7827404072873c092547
Merge: 9656e15 3da75f5
Author: Carl Suster <carl at contraflo.ws>
Date: Thu Jan 12 16:59:48 2017 +1100
merge patched into master
debian/.git-dpm | 4 ++--
debian/patches/0001-correct-splitbrain-module-path-in-docs.patch | 4 +++-
debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch | 4 +++-
.../patches/0003-cherry-pick-sort-os.listdir-before-comparing.patch | 4 +++-
debian/patches/0004-cherry-pick-use-poll-instead-of-select.patch | 4 +++-
.../0005-connect-client-and-server-IP-in-TestUdpRegistry.patch | 4 +++-
6 files changed, 17 insertions(+), 7 deletions(-)
diff --cc debian/.git-dpm
index 48bb070,0000000..895f7a8
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 9fab4ff270867cad759e119fead83028f8b187d2
- 9fab4ff270867cad759e119fead83028f8b187d2
++3da75f581da2afbbc9de627d6edfb0cbf09789a6
++3da75f581da2afbbc9de627d6edfb0cbf09789a6
+c782c046ea5d7875652f7afaf82d57bd90c80981
+c782c046ea5d7875652f7afaf82d57bd90c80981
+rpyc_3.3.0.orig.tar.gz
+ef2ebba439500b022d4088f6a7e7ca6a4f700b87
+546740
diff --cc debian/patches/0001-correct-splitbrain-module-path-in-docs.patch
index 16825a0,0000000..73b2a99
mode 100644,000000..100644
--- a/debian/patches/0001-correct-splitbrain-module-path-in-docs.patch
+++ b/debian/patches/0001-correct-splitbrain-module-path-in-docs.patch
@@@ -1,23 -1,0 +1,25 @@@
- From 0d50d789fa58e57e0808c6085665313c194e8102 Mon Sep 17 00:00:00 2001
++From 3b12835ea572c9df07fe9c4a51234801cb09e684 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Mon, 9 Jan 2017 17:21:47 +1100
+Subject: correct splitbrain module path in docs
+
+The splitbrain module is in `rpyc.experimental` in the package instead
+of `rpyc.utils` as in the documentation. This change allows Sphinx to
+find the module as intended.
++
++Forwarded: https://github.com/tomerfiliba/rpyc/pull/209
+---
+ docs/api/utils_splitbrain.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/api/utils_splitbrain.rst b/docs/api/utils_splitbrain.rst
+index 9c504bb..b743358 100644
+--- a/docs/api/utils_splitbrain.rst
++++ b/docs/api/utils_splitbrain.rst
+@@ -3,5 +3,5 @@
+ Splitbrain Python
+ =================
+
+-.. automodule:: rpyc.utils.splitbrain
++.. automodule:: rpyc.experimental.splitbrain
+ :members:
diff --cc debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch
index 46f926e,0000000..bfc9f58
mode 100644,000000..100644
--- a/debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch
+++ b/debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch
@@@ -1,36 -1,0 +1,38 @@@
- From 84f9c9ddd3f85cfe1095de345b8c09b24661dda9 Mon Sep 17 00:00:00 2001
++From 08e1766ae309aba1a4b5ad72563a765879d56b8c Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Mon, 9 Jan 2017 18:18:44 +1100
+Subject: skip SSH tests Test_Ssh and Test_Deploy
+
+These tests rely on `ssh localhost` working, so without ensuring the
+build environment has such an SSH server configured, we skip them.
++
++Forwarded: not-needed
+---
+ tests/test_deploy.py | 1 +
+ tests/test_ssh.py | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/tests/test_deploy.py b/tests/test_deploy.py
+index 222adaf..e01b400 100644
+--- a/tests/test_deploy.py
++++ b/tests/test_deploy.py
+@@ -5,6 +5,7 @@ from plumbum import SshMachine
+ from rpyc.utils.zerodeploy import DeployedServer
+
+
++ at unittest.skip('SSH tests disabled in Debian')
+ class TestDeploy(unittest.TestCase):
+ def test_deploy(self):
+ rem = SshMachine("localhost")
+diff --git a/tests/test_ssh.py b/tests/test_ssh.py
+index 4870c0c..19dcd1f 100644
+--- a/tests/test_ssh.py
++++ b/tests/test_ssh.py
+@@ -9,6 +9,7 @@ from rpyc import SlaveService
+ from plumbum import SshMachine
+
+
++ at unittest.skip('SSH tests disabled in Debian')
+ class Test_Ssh(unittest.TestCase):
+ def setUp(self):
+ if sys.platform == "win32":
diff --cc debian/patches/0003-cherry-pick-sort-os.listdir-before-comparing.patch
index 648d5bc,0000000..e7f3042
mode 100644,000000..100644
--- a/debian/patches/0003-cherry-pick-sort-os.listdir-before-comparing.patch
+++ b/debian/patches/0003-cherry-pick-sort-os.listdir-before-comparing.patch
@@@ -1,37 -1,0 +1,39 @@@
- From a829ff32250dc0b18f5a2ee2eece330be250af6c Mon Sep 17 00:00:00 2001
++From f17e12745af3e55dbac265ab5b74e08e6be7a4c3 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Mon, 9 Jan 2017 18:43:09 +1100
+Subject: cherry pick: sort os.listdir() before comparing
+
+Upstream commits:
+
+ 926fd0b07c53cadece8d8fae117311dafbd18e71
+ tomerfiliba committed on 21 Oct 2014
+ Tests: another fix for os.listdir
+
+ aa9ee566359bc492f361db119ea4994da3ca07f5
+ tomerfiliba committed on 21 Oct 2014
+ test: fix test_remoting issue
+
+These are necessary to run the test suite.
++
++Origin: upstream, https://github.com/tomerfiliba/rpyc/compare/aa9ee566359bc492f361db119ea4994da3ca07f5~1...926fd0b07c53cadece8d8fae117311dafbd18e71
+---
+ tests/test_remoting.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_remoting.py b/tests/test_remoting.py
+index 553cb1a..af4576c 100644
+--- a/tests/test_remoting.py
++++ b/tests/test_remoting.py
+@@ -25,10 +25,10 @@ class Test_Remoting(unittest.TestCase):
+ os.mkdir(os.path.join(base1, "somedir1"))
+
+ rpyc.classic.upload(self.conn, base1, base2)
+- self.assertEqual(os.listdir(base1), os.listdir(base2))
++ self.assertEqual(sorted(os.listdir(base1)), sorted(os.listdir(base2)))
+
+ rpyc.classic.download(self.conn, base2, base3)
+- self.assertEqual(os.listdir(base2), os.listdir(base3))
++ self.assertEqual(sorted(os.listdir(base2)), sorted(os.listdir(base3)))
+
+ shutil.rmtree(base)
+
diff --cc debian/patches/0004-cherry-pick-use-poll-instead-of-select.patch
index 2e1d30f,0000000..e96e973
mode 100644,000000..100644
--- a/debian/patches/0004-cherry-pick-use-poll-instead-of-select.patch
+++ b/debian/patches/0004-cherry-pick-use-poll-instead-of-select.patch
@@@ -1,56 -1,0 +1,58 @@@
- From c27d39de560f8ad81cddeadd54ef55d149e1b884 Mon Sep 17 00:00:00 2001
++From f6a26e46066e8c98bddddab50a6711cf1d9ed130 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Mon, 9 Jan 2017 18:54:58 +1100
+Subject: cherry pick: use poll() instead of select()
+
+Upstream commit:
+
+ 28ef9b694363c455afd4f513afabce778d9cc838
+ Giuseppe Lo Presti committed on 11 Dec 2015
+ Fixed bug #182: Stream uses select() and it is prone to its
+ limitations
+
+This was causing errors about negative file descriptors sometimes.
++
++Origin: upstream, https://github.com/tomerfiliba/rpyc/commit/28ef9b694363c455afd4f513afabce778d9cc838
+---
+ rpyc/core/stream.py | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/rpyc/core/stream.py b/rpyc/core/stream.py
+index 699d0d6..3aa7dbf 100644
+--- a/rpyc/core/stream.py
++++ b/rpyc/core/stream.py
+@@ -8,7 +8,7 @@ import socket
+ import time
+ import errno
+ from rpyc.lib import safe_import
+-from rpyc.lib.compat import select, select_error, BYTES_LITERAL, get_exc_errno, maxint
++from rpyc.lib.compat import poll, select_error, BYTES_LITERAL, get_exc_errno, maxint
+ win32file = safe_import("win32file")
+ win32pipe = safe_import("win32pipe")
+ msvcrt = safe_import("msvcrt")
+@@ -36,9 +36,11 @@ class Stream(object):
+ """indicates whether the stream has data to read (within *timeout*
+ seconds)"""
+ try:
++ p = poll() # from lib.compat, it may be a select object on non-Unix platforms
++ p.register(self.fileno(), "r")
+ while True:
+ try:
+- rl, _, _ = select([self], [], [], timeout)
++ rl = p.poll(timeout)
+ except select_error as ex:
+ if ex[0] == errno.EINTR:
+ continue
+@@ -47,8 +49,10 @@ class Stream(object):
+ else:
+ break
+ except ValueError as ex:
+- # i get this some times: "ValueError: file descriptor cannot be a negative integer (-1)"
+- # let's translate it to select.error
++ # if the underlying call is a select(), then the following errors may happen:
++ # - "ValueError: filedescriptor cannot be a negative integer (-1)"
++ # - "ValueError: filedescriptor out of range in select()"
++ # let's translate them to select.error
+ raise select_error(str(ex))
+ return bool(rl)
+ def read(self, count):
diff --cc debian/patches/0005-connect-client-and-server-IP-in-TestUdpRegistry.patch
index de47269,0000000..3e2e26a
mode 100644,000000..100644
--- a/debian/patches/0005-connect-client-and-server-IP-in-TestUdpRegistry.patch
+++ b/debian/patches/0005-connect-client-and-server-IP-in-TestUdpRegistry.patch
@@@ -1,33 -1,0 +1,35 @@@
- From 9fab4ff270867cad759e119fead83028f8b187d2 Mon Sep 17 00:00:00 2001
++From 3da75f581da2afbbc9de627d6edfb0cbf09789a6 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Mon, 9 Jan 2017 19:19:08 +1100
+Subject: connect client and server IP in TestUdpRegistry
+
+The client was never reaching the server since the former listened on
+0.0.0.0 and the latter on 255.255.255.255. It is not clear why the tests
+pass in upstream's CI.
++
++Forwarded: https://github.com/tomerfiliba/rpyc/pull/210
+---
+ tests/test_registry.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_registry.py b/tests/test_registry.py
+index 1340250..9773660 100644
+--- a/tests/test_registry.py
++++ b/tests/test_registry.py
+@@ -63,11 +63,14 @@ class TestTcpRegistry(BaseRegistryTest, unittest.TestCase):
+ return TCPRegistryClient("localhost")
+
+ class TestUdpRegistry(BaseRegistryTest, unittest.TestCase):
++ ip = '0.0.0.0'
++
+ def _get_server(self):
+- return UDPRegistryServer(pruning_timeout=PRUNING_TIMEOUT)
++ return UDPRegistryServer(pruning_timeout=PRUNING_TIMEOUT,
++ host=self.__class__.ip)
+
+ def _get_client(self):
+- return UDPRegistryClient()
++ return UDPRegistryClient(ip=self.__class__.ip)
+
+
+ if __name__ == "__main__":
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/rpyc.git
More information about the Python-modules-commits
mailing list