openstack/oslo.messaging
Code Issues Proposed changes

Merge "Make sure zmq can work with redis"

Browse Source
This commit is contained in:
Jenkins 2015-02-04 16:37:14 +00:00 committed by Gerrit Code Review
commit bd52d08efa
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/_drivers/matchmaker_redis.py
View File

@ -128,7 +128,7 @@ class MatchMakerRedis(mm_common.HeartbeatMatchMakerBase):
# No value is needed, we just # No value is needed, we just
# care if it exists. Sets aren't viable # care if it exists. Sets aren't viable
# because only keys can expire. # because only keys can expire.
pipe.set(key_host, '') pipe.sadd(key_host, '')
pipe.execute() pipe.execute()

5
tests/drivers/test_matchmaker_redis.py
View File

@ -46,6 +46,7 @@ class RedisMatchMakerTest(test_utils.BaseTestCase):
"network": ["controller1", "node1", "node2", "node3"], "network": ["controller1", "node1", "node2", "node3"],
"cert": ["controller1"], "cert": ["controller1"],
"console": ["controller1"], "console": ["controller1"],
"l3_agent.node1": ["node1"],
"consoleauth": ["controller1"]} "consoleauth": ["controller1"]}
self.matcher = matchmaker_redis.MatchMakerRedis() self.matcher = matchmaker_redis.MatchMakerRedis()
self.populate() self.populate()
@ -70,6 +71,10 @@ class RedisMatchMakerTest(test_utils.BaseTestCase):
self.assertEqual( self.assertEqual(
sorted(self.matcher.redis.smembers('cert')), sorted(self.matcher.redis.smembers('cert')),
['cert.controller1', 'cert.keymaster']) ['cert.controller1', 'cert.keymaster'])
self.matcher.register('l3_agent.node1', 'node1')
self.assertEqual(
sorted(self.matcher.redis.smembers('l3_agent.node1')),
['l3_agent.node1.node1'])
def test_unregister(self): def test_unregister(self):
self.matcher.unregister('conductor', 'controller1') self.matcher.unregister('conductor', 'controller1')