openstack/oslo.messaging
Code Issues Proposed changes

Properly distinguish between server index zero and no server

Browse Source 
Closes-Bug: #1424824
Change-Id: I1a8c1fa8ad953d9437e35d9f0ec38b6c97020009
This commit is contained in:
Kenneth Giusti 2015-02-23 15:59:57 -05:00
parent 097fb235b2
commit 9f457b4f3e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oslo_messaging/tests/functional/utils.py
View File

@ -143,20 +143,23 @@ class RpcServerGroupFixture(fixtures.Fixture):
ctrl_target=ctrl)
def client(self, server=None, cast=False):
if server:
if server is None:
target = self._target()
else:
if server == 'all':
target = self._target(fanout=True)
elif server >= 0 and server < len(self.targets):
target = self.targets[server]
else:
raise ValueError("Invalid value for server: %r" % server)
else:
target = self._target()
return ClientStub(self.transport.transport, target, cast=cast,
timeout=5)
def sync(self, server=None):
if server:
if server is None:
for i in range(len(self.servers)):
self.client(i).ping()
else:
if server == 'all':
c = self.client(server='all', cast=True)
c.sync(item='x')
@ -168,9 +171,6 @@ class RpcServerGroupFixture(fixtures.Fixture):
self.servers[server].syncq.get(timeout=5)
else:
raise ValueError("Invalid value for server: %r" % server)
else:
for i in range(len(self.servers)):
self.client(i).ping()
class RpcCall(object):