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

View File

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

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",
"configs_secure/conf.d/remote_servers.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",
"configs_secure/conf.d/remote_servers.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: