openstack/oslo.messaging
Code Issues Proposed changes

Fix fake driver with eventlet

Browse Source 
By storing the reply_q on the listener, we were assuming there was only
one message being dispatched at the time. Put it on the incoming message
instead and use it directly in reply().
This commit is contained in:
Mark McLoughlin 2013-06-16 12:23:11 +01:00
parent fd68391d53
commit 9cb803ee10
1 changed files with 8 additions and 9 deletions

17
oslo/messaging/_drivers/impl_fake.py

@ -35,8 +35,14 @@ class InvalidTarget(base.TransportDriverError, ValueError):
class FakeIncomingMessage(base.IncomingMessage): class FakeIncomingMessage(base.IncomingMessage):
def __init__(self, listener, ctxt, message, reply_q):
super(FakeIncomingMessage, self).__init__(listener, ctxt, message)
self._reply_q = reply_q
def reply(self, reply=None, failure=None): def reply(self, reply=None, failure=None):
self.listener._deliver_reply(reply, failure) # FIXME: handle failure
if self._reply_q:
self._reply_q.put(reply)
def done(self): def done(self):
pass pass
@ -48,18 +54,11 @@ class FakeListener(base.Listener):
super(FakeListener, self).__init__(driver, target) super(FakeListener, self).__init__(driver, target)
self._exchange = exchange self._exchange = exchange
def _deliver_reply(self, reply=None, failure=None):
# FIXME: handle failure
if self._reply_q:
self._reply_q.put(reply)
def poll(self): def poll(self):
self._reply_q = None
while True: while True:
(ctxt, message, reply_q) = self._exchange.poll(self.target) (ctxt, message, reply_q) = self._exchange.poll(self.target)
if message is not None: if message is not None:
self._reply_q = reply_q return FakeIncomingMessage(self, ctxt, message, reply_q)
return FakeIncomingMessage(self, ctxt, message)
time.sleep(.05) time.sleep(.05)