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

fixes

Browse Source
This commit is contained in:
Yatsishin Ilya 2021-05-21 07:59:16 +03:00
parent 1f8d43235f
commit e9f7246d2a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/integration/test_dictionaries_redis/test.py
View File

@ -1,5 +1,5 @@
import os import os
import shutil
import pytest import pytest
from helpers.cluster import ClickHouseCluster from helpers.cluster import ClickHouseCluster
from helpers.dictionary import Field, Row, Dictionary, DictionaryStructure, Layout from helpers.dictionary import Field, Row, Dictionary, DictionaryStructure, Layout
@ -95,8 +95,9 @@ def setup_module(module):
cluster = ClickHouseCluster(__file__) cluster = ClickHouseCluster(__file__)
for f in os.listdir(dict_configs_path): if os.path.exists(dict_configs_path):
os.remove(os.path.join(dict_configs_path, f)) shutil.rmtree(dict_configs_path)
os.mkdir(dict_configs_path)
for i, field in enumerate(FIELDS): for i, field in enumerate(FIELDS):
DICTIONARIES.append([]) DICTIONARIES.append([])

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

@ -162,12 +162,12 @@ def test_secure_connection():
node1 = cluster.add_instance('node1', main_configs=["configs_secure/client.crt", "configs_secure/client.key", node1 = cluster.add_instance('node1', main_configs=["configs_secure/client.crt", "configs_secure/client.key",
"configs_secure/conf.d/remote_servers.xml", "configs_secure/conf.d/remote_servers.xml",
"configs_secure/conf.d/ssl_conf.xml"], "configs_secure/conf.d/ssl_conf.xml"],
with_zookeeper=True, zookeeper_docker_compose_path=docker_compose.name, with_zookeeper=True, with_keeper=False, zookeeper_docker_compose_path=docker_compose.name,
) )
node2 = cluster.add_instance('node2', main_configs=["configs_secure/client.crt", "configs_secure/client.key", node2 = cluster.add_instance('node2', main_configs=["configs_secure/client.crt", "configs_secure/client.key",
"configs_secure/conf.d/remote_servers.xml", "configs_secure/conf.d/remote_servers.xml",
"configs_secure/conf.d/ssl_conf.xml"], "configs_secure/conf.d/ssl_conf.xml"],
with_zookeeper=True, zookeeper_docker_compose_path=docker_compose.name, with_zookeeper=True, with_keeper=False, zookeeper_docker_compose_path=docker_compose.name,
) )
try: try: