Merge lp:~therve/txamqp/queue-timeout into lp:txamqp

[Esteve Fernandez]

[Esteve Fernandez (esteve)]

review: Approve

[lp:~therve/txamqp/queue-timeout]

14. By Thomas Herve on 2009-05-14

Parametrize the reactor for easing tests.

=== modified file 'src/txamqp/queue.py'
--- src/txamqp/queue.py	2008-10-29 18:31:04 +0000
+++ src/txamqp/queue.py	2009-04-23 12:04:46 +0000
@@ -17,7 +17,9 @@
                 self.waiting.remove(deferred)
                 deferred.errback(Empty())
 
-    def _raiseIfClosed(self, result):
+    def _raiseIfClosed(self, result, call_id):
+        if call_id is not None:
+            call_id.cancel()
         if result == TimeoutDeferredQueue.END:
             self.put(TimeoutDeferredQueue.END)
 
@@ -28,10 +30,12 @@
     def get(self, timeout=None):
         deferred = DeferredQueue.get(self)
 
-        deferred.addCallback(self._raiseIfClosed)
-
+        call_id = None
         if timeout:
-            deferred.setTimeout(timeout, timeoutFunc=self._timeout)
+            from twisted.internet import reactor
+            call_id = reactor.callLater(timeout, self._timeout, deferred)
+        deferred.addCallback(self._raiseIfClosed, call_id)
+
         return deferred
 
     def close(self):