Merge lp:~therve/txamqp/close-queues into lp:txamqp

[Thomas Herve]

[Esteve Fernandez (esteve)]

Thanks Thomas!

review: Approve

=== modified file 'src/txamqp/protocol.py'
--- src/txamqp/protocol.py	2009-02-05 19:22:56 +0000
+++ src/txamqp/protocol.py	2009-04-21 10:18:10 +0000
@@ -255,6 +255,8 @@
     def close(self, reason):
         for ch in self.channels.values():
             ch.close(reason)
+        for q in self.queues.values():
+            q.close()
         self.delegate.close(reason)
 
     def writer(self, frame):
 
=== modified file 'src/txamqp/test/test_queue.py'
--- src/txamqp/test/test_queue.py	2008-10-29 18:31:04 +0000
+++ src/txamqp/test/test_queue.py	2009-04-21 10:18:10 +0000
@@ -257,3 +257,15 @@
             self.assertChannelException(404, e.args[0])
 
 
+    @inlineCallbacks
+    def test_close_queue(self):
+        from txamqp.queue import Closed as QueueClosed
+        channel = self.channel
+
+        reply = yield channel.queue_declare(queue="test-queue")
+        reply = yield channel.basic_consume(queue="test-queue")
+
+        queue = yield self.client.queue(reply.consumer_tag)
+        d = self.assertFailure(queue.get(timeout=1), QueueClosed)
+        self.client.close(None)
+        yield d