From 1006c4f11bce91b4fdf82f575f8f427828347805 Mon Sep 17 00:00:00 2001
From: "Ivan A. Torgashov" <it1804@mail.ru>
Date: Sat, 15 Aug 2020 14:18:17 +0500
Subject: [PATCH] Update tests for Redis dictionary requirepass authorization
 support

---
 .../integration/runner/compose/docker_compose_redis.yml  | 1 +
 .../external_sources.py                                  | 9 ++++++---
 .../test_dictionaries_all_layouts_and_sources/test.py    | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker/test/integration/runner/compose/docker_compose_redis.yml b/docker/test/integration/runner/compose/docker_compose_redis.yml
index 2dc79ed5910..2c9ace96d0c 100644
--- a/docker/test/integration/runner/compose/docker_compose_redis.yml
+++ b/docker/test/integration/runner/compose/docker_compose_redis.yml
@@ -5,3 +5,4 @@ services:
         restart: always
         ports:
           - 6380:6379
+        command: redis-server --requirepass "clickhouse"
diff --git a/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py b/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py
index f6985e7de54..fac7dcdea1e 100644
--- a/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py
+++ b/tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py
@@ -483,23 +483,27 @@ class SourceRedis(ExternalSource):
             name, internal_hostname, internal_port, docker_hostname, docker_port, user, password
         )
         self.storage_type = storage_type
+        self.db_index = 1
 
     def get_source_str(self, table_name):
         return '''
             <redis>
                 <host>{host}</host>
                 <port>{port}</port>
-                <db_index>0</db_index>
+                <password>{password}</password>
+                <db_index>{db_index}</db_index>
                 <storage_type>{storage_type}</storage_type>
             </redis>
         '''.format(
             host=self.docker_hostname,
             port=self.docker_port,
+            password=self.password,
             storage_type=self.storage_type,  # simple or hash_map
+            db_index=self.db_index,
         )
 
     def prepare(self, structure, table_name, cluster):
-        self.client = redis.StrictRedis(host=self.internal_hostname, port=self.internal_port)
+        self.client = redis.StrictRedis(host=self.internal_hostname, port=self.internal_port, db=self.db_index, password=self.password or None)
         self.prepared = True
         self.ordered_names = structure.get_ordered_names()
 
@@ -525,7 +529,6 @@ class SourceRedis(ExternalSource):
             return True
         return False
 
-
 class SourceAerospike(ExternalSource):
     def __init__(self, name, internal_hostname, internal_port,
                  docker_hostname, docker_port, user, password):
diff --git a/tests/integration/test_dictionaries_all_layouts_and_sources/test.py b/tests/integration/test_dictionaries_all_layouts_and_sources/test.py
index f4b0ba9c1e4..994d8e5e65d 100644
--- a/tests/integration/test_dictionaries_all_layouts_and_sources/test.py
+++ b/tests/integration/test_dictionaries_all_layouts_and_sources/test.py
@@ -134,8 +134,8 @@ DICTIONARIES = []
 
 # Key-value dictionaries with only one possible field for key
 SOURCES_KV = [
-    SourceRedis("RedisSimple", "localhost", "6380", "redis1", "6379", "", "", storage_type="simple"),
-    SourceRedis("RedisHash", "localhost", "6380", "redis1", "6379", "", "", storage_type="hash_map"),
+    SourceRedis("RedisSimple", "localhost", "6380", "redis1", "6379", "", "clickhouse", storage_type="simple"),
+    SourceRedis("RedisHash", "localhost", "6380", "redis1", "6379", "", "clickhouse", storage_type="hash_map"),
 ]
 
 DICTIONARIES_KV = []