thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests for Redis dictionary requirepass authorization support

Browse Source
This commit is contained in:
Ivan A. Torgashov 2020-08-15 14:18:17 +05:00
parent a1c0c52c5b
commit 1006c4f11b
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/test/integration/runner/compose/docker_compose_redis.yml
View File

@ -5,3 +5,4 @@ services:
restart: always
ports:
- 6380:6379
command: redis-server --requirepass "clickhouse"

9
tests/integration/test_dictionaries_all_layouts_and_sources/external_sources.py
View File

@ -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):

4
tests/integration/test_dictionaries_all_layouts_and_sources/test.py
View File

@ -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 = []