Merge pull request #1026 from paradiseng/redis_password

Fix redis auth failed when poolsize > 1
jookies · Feb 21, 2022 · b0e3aaa · b0e3aaa
2 parents 3cd5ed5 + 1569ba6
commit b0e3aaa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/jasmin/redis/client.py b/jasmin/redis/client.py
@@ -39,7 +39,7 @@ def clientConnectionFailed(self, connector, reason):
 
     def __init__(self, uuid, dbid, poolsize, isLazy=True,
                  handler=redis.ConnectionHandler, config=None):
-        redis.RedisFactory.__init__(self, uuid, dbid, poolsize, isLazy, handler)
+        redis.RedisFactory.__init__(self, uuid, dbid, poolsize, isLazy, handler, password=config.password)
 
         # Set up a dedicated logger
         self.log = logging.getLogger(LOG_CATEGORY)

diff --git a/tests/redis/test_client.py b/tests/redis/test_client.py
@@ -58,7 +58,7 @@ def tearDown(self):
         yield self.redisClient.disconnect()
 
 
-class DataTestCase(RedisTestCase):
+class DataTestCase(object):
     @defer.inlineCallbacks
     def test_set_get_string(self):
         yield self.redisClient.set('foo', 'bar')
@@ -116,3 +116,10 @@ def test_hmset_expiry(self):
         # Redis key must be expired
         g = yield self.redisClient.hgetall('h_test')
         self.assertEqual(g, {})
+
+class DataTestCaseWithAuth(AuthenticationTestCase, DataTestCase):
+    pass
+
+
+class DataTestCaseNoAuth(RedisTestCase, DataTestCase):
+    pass