From 6aff6c371f04e92279f29bf68f4c2c696db71b10 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Tue, 21 Apr 2015 10:08:48 +0200
Subject: [PATCH] Fix test_matchmaker_redis on Python 3
redis.smembers(str) returns a list of byte strings.
I missed test failures when I submited my patch to enable redis on
Python 3. I didn't notice that redis tests are skipped when no local
redis server is running.
Change-Id: Ib9ec4e05eb9abd51613f32c93118a1c76649798a
---
oslo_messaging/tests/drivers/test_matchmaker_redis.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/oslo_messaging/tests/drivers/test_matchmaker_redis.py b/oslo_messaging/tests/drivers/test_matchmaker_redis.py
index 77604040c..f2498cd6d 100644
--- a/oslo_messaging/tests/drivers/test_matchmaker_redis.py
+++ b/oslo_messaging/tests/drivers/test_matchmaker_redis.py
@@ -70,23 +70,23 @@ class RedisMatchMakerTest(test_utils.BaseTestCase):
self.matcher.register('cert', 'keymaster')
self.assertEqual(
sorted(self.matcher.redis.smembers('cert')),
- ['cert.controller1', 'cert.keymaster'])
+ [b'cert.controller1', b'cert.keymaster'])
self.matcher.register('l3_agent.node1', 'node1')
self.assertEqual(
sorted(self.matcher.redis.smembers('l3_agent.node1')),
- ['l3_agent.node1.node1'])
+ [b'l3_agent.node1.node1'])
def test_unregister(self):
self.matcher.unregister('conductor', 'controller1')
self.assertEqual(
sorted(self.matcher.redis.smembers('conductor')),
- ['conductor.node1', 'conductor.node2', 'conductor.node3'])
+ [b'conductor.node1', b'conductor.node2', b'conductor.node3'])
def test_ack_alive(self):
self.matcher.ack_alive('ack_alive', 'controller1')
self.assertEqual(
sorted(self.matcher.redis.smembers('ack_alive')),
- ['ack_alive.controller1'])
+ [b'ack_alive.controller1'])
def test_is_alive(self):
self.assertEqual(