[Python-modules-commits] [python-pika] 13/15: merge patched into master
Jan Dittberner
jandd at moszumanska.debian.org
Wed Dec 30 13:39:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
jandd pushed a commit to branch master
in repository python-pika.
commit a0799cdcc245ef515b211af8e7f35599fa6d7abf
Merge: 27124ac de39689
Author: Jan Dittberner <jandd at debian.org>
Date: Wed Dec 30 14:19:22 2015 +0100
merge patched into master
debian/.git-dpm | 4 +-
debian/patches/0001-Fix-the-channel-tests.patch | 54 ++++++++++++++++++++++
...Make-the-test-more-reliable-in-Python-3.5.patch | 27 +++++++++++
debian/patches/series | 2 +
tests/unit/channel_tests.py | 25 +++++-----
tests/unit/heartbeat_tests.py | 7 ++-
6 files changed, 103 insertions(+), 16 deletions(-)
diff --cc debian/.git-dpm
index 87bfc85,0000000..581582f
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
- 02aaec8506024857a5c0e715b122cbe0ecb78982
- 02aaec8506024857a5c0e715b122cbe0ecb78982
++de39689cab64d0c9505636479632e9ae739f8e30
++de39689cab64d0c9505636479632e9ae739f8e30
+02aaec8506024857a5c0e715b122cbe0ecb78982
+02aaec8506024857a5c0e715b122cbe0ecb78982
+python-pika_0.10.0.orig.tar.gz
+a18c032bf7d2b47c6aaa0b17d6ec02c66b2d95a9
+178327
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-the-channel-tests.patch
index 0000000,0000000..14816dc
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-the-channel-tests.patch
@@@ -1,0 -1,0 +1,54 @@@
++From fd5e31cdae7cbaf9fb73a8c5c772fc2a17adea6d Mon Sep 17 00:00:00 2001
++From: "Gavin M. Roy" <gavinr at aweber.com>
++Date: Wed, 4 Nov 2015 17:08:32 -0500
++Subject: Fix the channel tests
++
++---
++ tests/unit/channel_tests.py | 25 +++++++++++++------------
++ 1 file changed, 13 insertions(+), 12 deletions(-)
++
++diff --git a/tests/unit/channel_tests.py b/tests/unit/channel_tests.py
++index 0ae9317..a80996a 100644
++--- a/tests/unit/channel_tests.py
+++++ b/tests/unit/channel_tests.py
++@@ -841,27 +841,28 @@ class ChannelTests(unittest.TestCase):
++
++ def test_add_callbacks_basic_cancel_empty_added(self):
++ self.obj._add_callbacks()
++- self.obj.callbacks.add.assert_any_calls(self.obj.channel_number,
++- spec.Basic.Cancel,
++- self.obj._on_getempty, False)
+++ self.obj.callbacks.add.assert_any_call(self.obj.channel_number,
+++ spec.Basic.Cancel,
+++ self.obj._on_cancel, False)
++
++ def test_add_callbacks_basic_get_empty_added(self):
++ self.obj._add_callbacks()
++- self.obj.callbacks.add.assert_any_calls(self.obj.channel_number,
++- spec.Basic.GetEmpty,
++- self.obj._on_getempty, False)
+++ print(self.obj.callbacks.add.__dict__)
+++ self.obj.callbacks.add.assert_any_call(self.obj.channel_number,
+++ spec.Basic.GetEmpty,
+++ self.obj._on_getempty, False)
++
++ def test_add_callbacks_channel_close_added(self):
++ self.obj._add_callbacks()
++- self.obj.callbacks.add.assert_any_calls(self.obj.channel_number,
++- spec.Channel.Close,
++- self.obj._on_getempty, False)
+++ self.obj.callbacks.add.assert_any_call(self.obj.channel_number,
+++ spec.Channel.Close,
+++ self.obj._on_close, True)
++
++ def test_add_callbacks_channel_flow_added(self):
++ self.obj._add_callbacks()
++- self.obj.callbacks.add.assert_any_calls(self.obj.channel_number,
++- spec.Channel.Flow,
++- self.obj._on_getempty, False)
+++ self.obj.callbacks.add.assert_any_call(self.obj.channel_number,
+++ spec.Channel.Flow,
+++ self.obj._on_flow, False)
++
++ def test_cleanup(self):
++ self.obj._cleanup()
diff --cc debian/patches/0002-Make-the-test-more-reliable-in-Python-3.5.patch
index 0000000,0000000..bb25fab
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Make-the-test-more-reliable-in-Python-3.5.patch
@@@ -1,0 -1,0 +1,27 @@@
++From de39689cab64d0c9505636479632e9ae739f8e30 Mon Sep 17 00:00:00 2001
++From: "Gavin M. Roy" <gavinr at aweber.com>
++Date: Wed, 4 Nov 2015 17:00:40 -0500
++Subject: Make the test more reliable in Python 3.5
++
++---
++ tests/unit/heartbeat_tests.py | 7 +++++--
++ 1 file changed, 5 insertions(+), 2 deletions(-)
++
++diff --git a/tests/unit/heartbeat_tests.py b/tests/unit/heartbeat_tests.py
++index 9ec496f..62aa777 100644
++--- a/tests/unit/heartbeat_tests.py
+++++ b/tests/unit/heartbeat_tests.py
++@@ -152,8 +152,11 @@ class HeartbeatTests(unittest.TestCase):
++ self.assertIsInstance(self.obj._new_heartbeat_frame(), frame.Heartbeat)
++
++ def test_send_heartbeat_send_frame_called(self):
++- self.obj._send_heartbeat_frame()
++- self.mock_conn._send_frame.assert_called_once()
+++ frame_value = self.obj._new_heartbeat_frame()
+++ with mock.patch.object(self.obj, '_new_heartbeat_frame') as new_frame:
+++ new_frame.return_value = frame_value
+++ self.obj._send_heartbeat_frame()
+++ self.mock_conn._send_frame.assert_called_once_with(frame_value)
++
++ def test_send_heartbeat_counter_incremented(self):
++ self.obj._send_heartbeat_frame()
diff --cc debian/patches/series
index 0000000,0000000..30882d2
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Fix-the-channel-tests.patch
++0002-Make-the-test-more-reliable-in-Python-3.5.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pika.git
More information about the Python-modules-commits
mailing list