From 587be009d51f4a13b420a333ab3a289b4c6bd3e7 Mon Sep 17 00:00:00 2001 From: penn Date: Wed, 5 Apr 2017 17:42:47 +0800 Subject: [PATCH 1/4] Update RedisLibraryKeywords.py update redis_conn, add passwd to authenticate. --- RedisLibrary/RedisLibraryKeywords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RedisLibrary/RedisLibraryKeywords.py b/RedisLibrary/RedisLibraryKeywords.py index 7104af3..a65e244 100644 --- a/RedisLibrary/RedisLibraryKeywords.py +++ b/RedisLibrary/RedisLibraryKeywords.py @@ -23,10 +23,10 @@ def connect_to_redis(self, redis_host, redis_port=6379, db=0): # pragma: no cove Return redis connection object Examples: - | ${redis_conn}= | Connect To Redis | redis-dev.com | 6379 | + | ${redis_conn}= | Connect To Redis | redis-dev.com | 6379 | passwd """ try: - redis_conn = redis.StrictRedis(host=redis_host, port=redis_port, db=db) + redis_conn = redis.StrictRedis(host=redis_host, port=redis_port, db=db, password=None) except Exception as ex: logger.error(str(ex)) raise Exception(str(ex)) From b056bc0657e063863c6df872be460af36cd66892 Mon Sep 17 00:00:00 2001 From: penn Date: Wed, 5 Apr 2017 17:46:13 +0800 Subject: [PATCH 2/4] Update RedisLibraryKeywords.py update method connect_to_redis --- RedisLibrary/RedisLibraryKeywords.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RedisLibrary/RedisLibraryKeywords.py b/RedisLibrary/RedisLibraryKeywords.py index a65e244..ab7fcdb 100644 --- a/RedisLibrary/RedisLibraryKeywords.py +++ b/RedisLibrary/RedisLibraryKeywords.py @@ -12,13 +12,14 @@ class RedisLibraryKeywords(object): @keyword('Connect To Redis') - def connect_to_redis(self, redis_host, redis_port=6379, db=0): # pragma: no cover + def connect_to_redis(self, redis_host, redis_port=6379, db=0, password=None): # pragma: no cover """Connect to the Redis server. Arguments: - redis_host: hostname or IP address of the Redis server. - redis_port: Redis port number (default=6379) - db: Redis keyspace number (default=0) + - password: for authentication required Return redis connection object From e69feb25d36d115787fbeda2219dcd20b3943831 Mon Sep 17 00:00:00 2001 From: penn Date: Wed, 5 Apr 2017 18:10:06 +0800 Subject: [PATCH 3/4] Update RedisLibraryKeywords.py update redis.StrictRedis password parameter --- RedisLibrary/RedisLibraryKeywords.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RedisLibrary/RedisLibraryKeywords.py b/RedisLibrary/RedisLibraryKeywords.py index ab7fcdb..7c605e1 100644 --- a/RedisLibrary/RedisLibraryKeywords.py +++ b/RedisLibrary/RedisLibraryKeywords.py @@ -19,15 +19,15 @@ def connect_to_redis(self, redis_host, redis_port=6379, db=0, password=None): # - redis_host: hostname or IP address of the Redis server. - redis_port: Redis port number (default=6379) - db: Redis keyspace number (default=0) - - password: for authentication required + - redis_password: for authentication required Return redis connection object Examples: - | ${redis_conn}= | Connect To Redis | redis-dev.com | 6379 | passwd + | ${redis_conn}= | Connect To Redis | redis-dev.com | 6379 | password """ try: - redis_conn = redis.StrictRedis(host=redis_host, port=redis_port, db=db, password=None) + redis_conn = redis.StrictRedis(host=redis_host, port=redis_port, db=db, password=redis_password) except Exception as ex: logger.error(str(ex)) raise Exception(str(ex)) From e2f29aee7f7076777540055af783ba1f3a4ba6a9 Mon Sep 17 00:00:00 2001 From: penn Date: Wed, 5 Apr 2017 18:13:32 +0800 Subject: [PATCH 4/4] Update RedisLibraryKeywords.py update connect_to_redis, change password to redis_password --- RedisLibrary/RedisLibraryKeywords.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RedisLibrary/RedisLibraryKeywords.py b/RedisLibrary/RedisLibraryKeywords.py index 7c605e1..b50fb6d 100644 --- a/RedisLibrary/RedisLibraryKeywords.py +++ b/RedisLibrary/RedisLibraryKeywords.py @@ -12,7 +12,7 @@ class RedisLibraryKeywords(object): @keyword('Connect To Redis') - def connect_to_redis(self, redis_host, redis_port=6379, db=0, password=None): # pragma: no cover + def connect_to_redis(self, redis_host, redis_port=6379, db=0, redis_password=None): # pragma: no cover """Connect to the Redis server. Arguments: