Test stuff

6 files changed, 43 insertions, 47 deletions

diff --git a/librabbitmq/__init__.py b/librabbitmq/__init__.py
index dc0bee3..b8a86a0 100644
--- a/librabbitmq/__init__.py
+++ b/librabbitmq/__init__.py
@@ -22,7 +22,7 @@ __all__ = ['Connection', 'Message', 'ConnectionError', 'ChannelError']
 
 class Message(object):
 
-    def __init__(self, channel, properties, delivery_info, body):
+    def __init__(self, channel, properties, delivery_info={}, body=''):
         self.channel = channel
         self.properties = properties
         self.delivery_info = delivery_info
diff --git a/librabbitmq/tests/test_functional.py b/librabbitmq/tests/test_functional.py
index 7fbd459..73adc10 100644
--- a/librabbitmq/tests/test_functional.py
+++ b/librabbitmq/tests/test_functional.py
@@ -2,21 +2,22 @@ import socket
 import unittest2 as unittest
 
 from librabbitmq import Message, Connection, ConnectionError, ChannelError
-TEST_QUEUE = "pyrabbit.testq"
+TEST_QUEUE = 'pyrabbit.testq'
 
 
 class test_Channel(unittest.TestCase):
 
     def setUp(self):
-        self.connection = Connection(host="localhost:5672", userid="guest",
-                                     password="guest", virtual_host="/")
+        self.connection = Connection(host='localhost:5672', userid='guest',
+                                     password='guest', virtual_host='/')
         self.channel = self.connection.channel()
+        self.channel.queue_delete(TEST_QUEUE)
         self._queue_declare()
 
     def test_send_message(self):
-        message = Message("the quick brown fox jumps over the lazy dog",
-                properties=dict(content_type="application/json",
-                                content_encoding="utf-8"))
+        message = Message('the quick brown fox jumps over the lazy dog',
+                properties=dict(content_type='application/json',
+                                content_encoding='utf-8'))
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
@@ -26,17 +27,17 @@ class test_Channel(unittest.TestCase):
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
 
     def _queue_declare(self):
-        self.channel.exchange_declare(TEST_QUEUE, "direct")
+        self.channel.exchange_declare(TEST_QUEUE, 'direct')
         x = self.channel.queue_declare(TEST_QUEUE)
-        self.assertIn("message_count", x)
-        self.assertIn("consumer_count", x)
-        self.assertEqual(x["queue"], TEST_QUEUE)
+        self.assertEqual(x.message_count, x[1])
+        self.assertEqual(x.consumer_count, x[2])
+        self.assertEqual(x.queue, TEST_QUEUE)
         self.channel.queue_bind(TEST_QUEUE, TEST_QUEUE, TEST_QUEUE)
 
     def test_basic_get_ack(self):
-        message = Message("the quick brown fox jumps over the lazy dog",
-                properties=dict(content_type="application/json",
-                                content_encoding="utf-8"))
+        message = Message('the quick brown fox jumps over the lazy dog',
+                properties=dict(content_type='application/json',
+                                content_encoding='utf-8'))
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
@@ -45,12 +46,12 @@ class test_Channel(unittest.TestCase):
             if x:
                 break
         self.assertIs(self.channel, x.channel)
-        self.assertIn("message_count", x.delivery_info)
-        self.assertIn("redelivered", x.delivery_info)
-        self.assertEqual(x.delivery_info["routing_key"], TEST_QUEUE)
-        self.assertEqual(x.delivery_info["exchange"], TEST_QUEUE)
-        self.assertTrue(x.delivery_info["delivery_tag"])
-        self.assertTrue(x.properties["content_type"])
+        self.assertIn('message_count', x.delivery_info)
+        self.assertIn('redelivered', x.delivery_info)
+        self.assertEqual(x.delivery_info['routing_key'], TEST_QUEUE)
+        self.assertEqual(x.delivery_info['exchange'], TEST_QUEUE)
+        self.assertTrue(x.delivery_info['delivery_tag'])
+        self.assertTrue(x.properties['content_type'])
         self.assertTrue(x.body)
         x.ack()
 
@@ -59,9 +60,9 @@ class test_Channel(unittest.TestCase):
         that we can fetch them with a timeout without needing to receive
         any more messages."""
 
-        message = Message("the quick brown fox jumps over the lazy dog",
-                          properties=dict(content_type="application/json",
-                                          content_encoding="utf-8"))
+        message = Message('the quick brown fox jumps over the lazy dog',
+                          properties=dict(content_type='application/json',
+                                          content_encoding='utf-8'))
 
         for i in xrange(100):
             self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
@@ -81,9 +82,9 @@ class test_Channel(unittest.TestCase):
     def test_timeout(self):
         """Check that our ``drain_events`` call actually times out if
         there are no messages."""
-        message = Message("the quick brown fox jumps over the lazy dog",
-                          properties=dict(content_type="application/json",
-                                          content_encoding="utf-8"))
+        message = Message('the quick brown fox jumps over the lazy dog',
+                          properties=dict(content_type='application/json',
+                                          content_encoding='utf-8'))
 
         self.channel.basic_publish(message, TEST_QUEUE, TEST_QUEUE)
 
@@ -101,7 +102,7 @@ class test_Channel(unittest.TestCase):
         self.assertEquals(len(messages), 1)
 
     def tearDown(self):
-        if self.channel:
+        if self.channel and self.connection.connected:
             self.channel.queue_purge(TEST_QUEUE)
             self.channel.close()
         if self.connection:
@@ -113,17 +114,18 @@ class test_Channel(unittest.TestCase):
 class test_Delete(unittest.TestCase):
 
     def setUp(self):
-        self.connection = Connection(host="localhost:5672", userid="guest",
-                                     password="guest", virtual_host="/")
+        self.connection = Connection(host='localhost:5672', userid='guest',
+                                     password='guest', virtual_host='/')
         self.channel = self.connection.channel()
-        self.TEST_QUEUE = "pyrabbitmq.testq2"
+        self.TEST_QUEUE = 'pyrabbitmq.testq2'
+        self.channel.queue_delete(self.TEST_QUEUE)
 
     def test_delete(self):
         """Test that we can declare a channel delete it, and then declare with
         different properties"""
 
-        res = self.channel.exchange_declare(self.TEST_QUEUE, "direct")
-        res =self.channel.queue_declare(self.TEST_QUEUE)
+        res = self.channel.exchange_declare(self.TEST_QUEUE, 'direct')
+        res = self.channel.queue_declare(self.TEST_QUEUE)
         res = self.channel.queue_bind(self.TEST_QUEUE, self.TEST_QUEUE,
                                 self.TEST_QUEUE)
 
@@ -132,22 +134,20 @@ class test_Delete(unittest.TestCase):
 
         # Declare it again
         x = self.channel.queue_declare(self.TEST_QUEUE, durable=True)
-        self.assertIn("message_count", x)
-        self.assertIn("consumer_count", x)
-        self.assertEqual(x["queue"], self.TEST_QUEUE)
+        self.assertEqual(x.queue, self.TEST_QUEUE)
 
         self.channel.queue_delete(self.TEST_QUEUE)
 
     def test_delete_empty(self):
         """Test that the queue doesn't get deleted if it is not empty"""
-        self.channel.exchange_declare(self.TEST_QUEUE, "direct")
+        self.channel.exchange_declare(self.TEST_QUEUE, 'direct')
         self.channel.queue_declare(self.TEST_QUEUE)
         self.channel.queue_bind(self.TEST_QUEUE, self.TEST_QUEUE,
                                 self.TEST_QUEUE)
 
-        message = Message("the quick brown fox jumps over the lazy dog",
-                          properties=dict(content_type="application/json",
-                                          content_encoding="utf-8"))
+        message = Message('the quick brown fox jumps over the lazy dog',
+                          properties=dict(content_type='application/json',
+                                          content_encoding='utf-8'))
 
         self.channel.basic_publish(message, self.TEST_QUEUE, self.TEST_QUEUE)
 
@@ -162,7 +162,7 @@ class test_Delete(unittest.TestCase):
         self.channel.queue_delete(self.TEST_QUEUE, if_empty=True)
 
     def tearDown(self):
-        if self.channel:
+        if self.channel and self.connection.connected:
             self.channel.queue_purge(TEST_QUEUE)
             self.channel.close()
         if self.connection:
diff --git a/requirements/default.txt b/requirements/default.txt
index dc99b00..22439cb 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -1 +1 @@
-amqp>=1.2.1
+amqp>=1.4.6
diff --git a/requirements/test.txt b/requirements/test.txt
index 63c4c40..70e6505 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,4 +1,3 @@
 unittest2>=0.4.0
 nose
-nose-cover3
 mock
diff --git a/setup.cfg b/setup.cfg
index 871199e..d739214 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,5 @@
 [nosetests]
 where = librabbitmq/tests
-cover3-branch = 1
-cover3-html = 1
-cover3-package = librabbitmq
 
 [build_sphinx]
 source-dir = docs/
@@ -13,4 +10,4 @@ all_files = 1
 upload-dir = docs/.build/html
 
 [bdist_rpm]
-requires = amqp >= 1.2.0
+requires = amqp >= 1.4.6
diff --git a/setup.py b/setup.py
index 641108c..b1e4dd4 100644
--- a/setup.py
+++ b/setup.py
@@ -223,7 +223,7 @@ setup(
     packages=packages,
     cmdclass=cmdclass,
     install_requires=[
-        'amqp>=1.2.1',
+        'amqp>=1.4.6',
     ],
     ext_modules=ext_modules,
     classifiers=[