[Python-modules-commits] [python-ws4py] 05/06: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Mon Feb 20 02:05:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-ws4py.
commit 5b110ffcf60e8e5e05025604b0438d277de1a5a1
Merge: 025118c 13ac903
Author: Sandro Tosi <morph at debian.org>
Date: Sun Feb 19 20:55:51 2017 -0500
merge patched into master
debian/.git-dpm | 4 ++--
debian/patches/0001-Fix-tests.patch | 24 +++++++++++++++-------
...ntersphinx-use-object.inv-from-python-doc.patch | 2 +-
...03-fix-unittest-failing-on-1-CPU-machines.patch | 21 -------------------
debian/patches/series | 1 -
5 files changed, 20 insertions(+), 32 deletions(-)
diff --cc debian/.git-dpm
index ee54941,0000000..d0c9943
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 2d394089d01463eb8ae1da39506d0852feefc820
- 2d394089d01463eb8ae1da39506d0852feefc820
++13ac903999b5f3472de0794d710e88d31793c436
++13ac903999b5f3472de0794d710e88d31793c436
+7f43f2a6bff1aabafad023652042439d7b9b8d84
+7f43f2a6bff1aabafad023652042439d7b9b8d84
+python-ws4py_0.3.4.orig.tar.gz
+865bf7f4524ac4c5c3b16c9b6efd2c6bc24c497a
+64676
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-tests.patch
index 8cee406,0000000..fb263af
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-tests.patch
+++ b/debian/patches/0001-Fix-tests.patch
@@@ -1,67 -1,0 +1,77 @@@
- From a7d5ce7c1e8d39c2e68eeb6ef5bab72b3981dc37 Mon Sep 17 00:00:00 2001
++From 3722f5ece7e22ed67a84bfaae464853a146d2eb4 Mon Sep 17 00:00:00 2001
+From: Stein Magnus Jodal <jodal at debian.org>
+Date: Thu, 5 Nov 2015 15:46:08 +0100
+Subject: Fix tests
+
+Based on upstream commits:
+- b5d47f7b3497f1b713a20fe6306b7d9afdd8c408
+- b2a76a33960040d7d3d27c68bf17c12f169f81c7
++
++fix unittest failing on 1 CPU machines
+---
- test/test_manager.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
++ test/test_manager.py | 14 ++++++++------
++ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/test/test_manager.py b/test/test_manager.py
- index 8c229b0..da57d44 100644
++index 8c229b0..fceb77d 100644
+--- a/test/test_manager.py
++++ b/test/test_manager.py
+@@ -16,10 +16,10 @@ class WSManagerTest(unittest.TestCase):
+ ws.sock.fileno.return_value = 1
+
+ m.add(ws)
+- m.poller.register.assert_call_once_with(ws)
++ m.poller.register.assert_called_once_with(1)
+
+ m.remove(ws)
+- m.poller.unregister.assert_call_once_with(ws)
++ m.poller.unregister.assert_called_once_with(1)
+
+ @patch('ws4py.manager.SelectPoller')
+ def test_cannot_add_websocket_more_than_once(self, MockSelectPoller):
+@@ -49,7 +49,7 @@ class WSManagerTest(unittest.TestCase):
+ self.assertEqual(len(m), 1)
+ m.remove(ws)
+ self.assertEqual(len(m), 0)
+- m.poller.unregister.assert_call_once_with(ws)
++ m.poller.unregister.assert_called_once_with(1)
+ m.poller.reset_mock()
+
+ m.remove(ws)
- @@ -97,8 +97,9 @@ class WSManagerTest(unittest.TestCase):
++@@ -62,6 +62,7 @@ class WSManagerTest(unittest.TestCase):
++ self.assertFalse(m.running)
++
++ m.start()
+++ time.sleep(0.2)
++ self.assertTrue(m.running)
++
++ m.stop()
++@@ -97,8 +98,9 @@ class WSManagerTest(unittest.TestCase):
+
+ m.add(ws)
+ m.start()
++ time.sleep(0.2)
+
+- ws.terminate.assert_call_once_with()
++ ws.terminate.assert_called_once_with()
+
+ m.stop()
+
- @@ -109,7 +110,7 @@ class WSManagerTest(unittest.TestCase):
++@@ -109,7 +111,7 @@ class WSManagerTest(unittest.TestCase):
+ ws = MagicMock()
+ m.add(ws)
+ m.close_all()
+- ws.terminate.assert_call_once_with(1001, 'Server is shutting down')
++ ws.close.assert_called_once_with(code=1001, reason='Server is shutting down')
+
+ @patch('ws4py.manager.SelectPoller')
+ def test_broadcast(self, MockSelectPoller):
- @@ -120,7 +121,7 @@ class WSManagerTest(unittest.TestCase):
++@@ -120,7 +122,7 @@ class WSManagerTest(unittest.TestCase):
+ m.add(ws)
+
+ m.broadcast(b'hello there')
+- ws.send.assert_call_once_with(b'hello there')
++ ws.send.assert_called_once_with(b'hello there', False)
+
+ @patch('ws4py.manager.SelectPoller')
+ def test_broadcast_failure_must_not_break_caller(self, MockSelectPoller):
diff --cc debian/patches/0002-Make-intersphinx-use-object.inv-from-python-doc.patch
index 30cbb36,0000000..258b2a7
mode 100644,000000..100644
--- a/debian/patches/0002-Make-intersphinx-use-object.inv-from-python-doc.patch
+++ b/debian/patches/0002-Make-intersphinx-use-object.inv-from-python-doc.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 750981d4c6165b945def438b4dd790c3326d03de Mon Sep 17 00:00:00 2001
++From 13ac903999b5f3472de0794d710e88d31793c436 Mon Sep 17 00:00:00 2001
+From: Stein Magnus Jodal <jodal at debian.org>
+Date: Sun, 7 Aug 2016 22:56:09 +0200
+Subject: Make intersphinx use object.inv from python-doc
+
+---
+ docs/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 8db4293..56d356b 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -37,7 +37,7 @@ extensions = ['sphinx.ext.autodoc',
+ 'sphinxcontrib.seqdiag']
+ autoclass_content = 'init'
+ autodoc_member_order = 'bysource'
+-intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)}
++intersphinx_mapping = {'python': ('/usr/share/doc/python-doc/html', None)}
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
diff --cc debian/patches/series
index 2b1859b,0000000..6a6a433
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+0001-Fix-tests.patch
+0002-Make-intersphinx-use-object.inv-from-python-doc.patch
- 0003-fix-unittest-failing-on-1-CPU-machines.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-ws4py.git
More information about the Python-modules-commits
mailing list