From 90930bb8e732b1b0afdfc4537bf8860c893171a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@henrietta.com.pl>
Date: Sun, 25 Dec 2016 01:20:55 +0100
Subject: [PATCH] v0.11 RC, submit for tests
---
coolamqp/messages.py | 2 ++
coolamqp/orders.py | 13 +++++++++++--
tests/test_basics.py | 2 +-
tests/test_noack.py | 2 +-
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/coolamqp/messages.py b/coolamqp/messages.py
index 324a497..8fe56d7 100644
--- a/coolamqp/messages.py
+++ b/coolamqp/messages.py
@@ -13,6 +13,8 @@ class Message(object):
:type body: str (py2) or bytes (py3)
:param properties: AMQP properties to be sent along
"""
+ if isinstance(body, six.text_type):
+ raise TypeError('body cannot be a text type!')
self.body = six.binary_type(body)
self.properties = {} if properties is None else properties
diff --git a/coolamqp/orders.py b/coolamqp/orders.py
index ddcaa19..79399fe 100644
--- a/coolamqp/orders.py
+++ b/coolamqp/orders.py
@@ -75,9 +75,11 @@ class _Exchange(Order):
Order.__init__(self, on_completed=on_completed, on_failed=on_failed)
self.exchange = exchange
+
class DeclareExchange(_Exchange):
"""Declare an exchange"""
+
class DeleteExchange(_Exchange):
"""Delete an exchange"""
@@ -88,18 +90,23 @@ class _Queue(Order):
Order.__init__(self, on_completed=on_completed, on_failed=on_failed)
self.queue = queue
+
class DeclareQueue(_Queue):
"""Declare a a queue"""
+
class ConsumeQueue(_Queue):
"""Declare and consume from a queue"""
def __init__(self, queue, no_ack=False, on_completed=None, on_failed=None):
_Queue.__init__(self, queue, on_completed=on_completed, on_failed=on_failed)
self.no_ack = no_ack
+
+
class DeleteQueue(_Queue):
"""Delete a queue"""
+
class CancelQueue(_Queue):
"""Cancel consuming from a queue"""
@@ -108,8 +115,8 @@ class SetQoS(Order):
"""Set QoS"""
def __init__(self, prefetch_window, prefetch_count, on_completed=None, on_failed=None):
Order.__init__(self, on_completed=on_completed, on_failed=on_failed)
- self.qos = (prefetch_window, prefetch_count)
-
+ self.qos = prefetch_window, prefetch_count
+1
class _AcksAndNacks(Order):
"""related to acking and nacking"""
@@ -118,8 +125,10 @@ class _AcksAndNacks(Order):
self.connect_id = connect_id
self.delivery_tag = delivery_tag
+
class AcknowledgeMessage(_AcksAndNacks):
"""ACK a message"""
+
class NAcknowledgeMessage(_AcksAndNacks):
"""NACK a message"""
diff --git a/tests/test_basics.py b/tests/test_basics.py
index 7535e51..c777f4e 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -23,7 +23,7 @@ class TestThings(unittest.TestCase):
class TestBasics(unittest.TestCase):
def setUp(self):
self.amqp = getamqp()
- self.assertIsInstance(self.amqp.drain(1), ConnectionUp)
+ self.assertIsInstance(self.amqp.drain(2), ConnectionUp)
def tearDown(self):
self.amqp.shutdown()
diff --git a/tests/test_noack.py b/tests/test_noack.py
index 16219fb..3a83f89 100644
--- a/tests/test_noack.py
+++ b/tests/test_noack.py
@@ -35,7 +35,7 @@ class TestNoAcknowledge(unittest.TestCase):
def test_noack_works_after_restart(self):
myq = Queue('myqueue', exclusive=True)
- self.amqp.qos(0,1 )
+ self.amqp.qos(0, 1)
self.amqp.consume(myq, no_ack=True)
--
GitLab