[Python-modules-commits] [python-ws4py] 18/20: merge patched into master

[Stein Magnus Jodal]

This is an automated email from the git hooks/post-receive script.

jodal pushed a commit to branch master
in repository python-ws4py.

commit 07dcaac08d4405fbee241213b93a68753be9dc15
Merge: 09841a4 a7d5ce7
Author: Stein Magnus Jodal <jodal at debian.org>
Date:   Thu Nov 5 15:46:35 2015 +0100

    merge patched into master

 debian/.git-dpm                     |  4 +--
 debian/patches/0001-Fix-tests.patch | 67 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 test/test_manager.py                | 13 +++----
 4 files changed, 77 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 34f7446,0000000..23b11e3
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
- 7f43f2a6bff1aabafad023652042439d7b9b8d84
- 7f43f2a6bff1aabafad023652042439d7b9b8d84
++a7d5ce7c1e8d39c2e68eeb6ef5bab72b3981dc37
++a7d5ce7c1e8d39c2e68eeb6ef5bab72b3981dc37
 +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 0000000,0000000..8cee406
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-tests.patch
@@@ -1,0 -1,0 +1,67 @@@
++From a7d5ce7c1e8d39c2e68eeb6ef5bab72b3981dc37 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
++---
++ test/test_manager.py | 13 +++++++------
++ 1 file changed, 7 insertions(+), 6 deletions(-)
++
++diff --git a/test/test_manager.py b/test/test_manager.py
++index 8c229b0..da57d44 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):
++         
++         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):
++         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):
++         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/series
index 0000000,0000000..afe4e4f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-ws4py.git