openstack/oslo.messaging
Code Issues Proposed changes

Merge "Properly distinguish between server index zero and no server"

Browse Source
This commit is contained in:
Jenkins 2015-03-11 16:10:08 +00:00 committed by Gerrit Code Review
commit 8836d3e43c
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) ctrl_target=ctrl)
def client(self, server=None, cast=False): def client(self, server=None, cast=False):
if server: if server is None:
target = self._target()
else:
if server == 'all': if server == 'all':
target = self._target(fanout=True) target = self._target(fanout=True)
elif server >= 0 and server < len(self.targets): elif server >= 0 and server < len(self.targets):
target = self.targets[server] target = self.targets[server]
else: else:
raise ValueError("Invalid value for server: %r" % server) raise ValueError("Invalid value for server: %r" % server)
else:
target = self._target()
return ClientStub(self.transport.transport, target, cast=cast, return ClientStub(self.transport.transport, target, cast=cast,
timeout=5) timeout=5)
def sync(self, server=None): 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': if server == 'all':
c = self.client(server='all', cast=True) c = self.client(server='all', cast=True)
c.sync(item='x') c.sync(item='x')
@ -168,9 +171,6 @@ class RpcServerGroupFixture(fixtures.Fixture):
self.servers[server].syncq.get(timeout=5) self.servers[server].syncq.get(timeout=5)
else: else:
raise ValueError("Invalid value for server: %r" % server) raise ValueError("Invalid value for server: %r" % server)
else:
for i in range(len(self.servers)):
self.client(i).ping()
class RpcCall(object): class RpcCall(object):