From e9f7246d2a0c8f480e4b7452f9b1bd6b9df26b6d Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Fri, 21 May 2021 07:59:16 +0300
Subject: [PATCH] fixes

---
 tests/integration/test_dictionaries_redis/test.py | 7 ++++---
 tests/integration/test_zookeeper_config/test.py   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/integration/test_dictionaries_redis/test.py b/tests/integration/test_dictionaries_redis/test.py
index 7fcbd0d0909..e5a51bcb88a 100644
--- a/tests/integration/test_dictionaries_redis/test.py
+++ b/tests/integration/test_dictionaries_redis/test.py
@@ -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([])
diff --git a/tests/integration/test_zookeeper_config/test.py b/tests/integration/test_zookeeper_config/test.py
index 86d94f88e8a..9d6018fff2c 100644
--- a/tests/integration/test_zookeeper_config/test.py
+++ b/tests/integration/test_zookeeper_config/test.py
@@ -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: