diff --git a/dbms/tests/integration/test_cluster_copier/configs/config.d/ddl.xml b/dbms/tests/integration/test_cluster_copier/configs/config.d/ddl.xml index 27e7eb0ff43..abad0dee450 100644 --- a/dbms/tests/integration/test_cluster_copier/configs/config.d/ddl.xml +++ b/dbms/tests/integration/test_cluster_copier/configs/config.d/ddl.xml @@ -2,8 +2,4 @@ /clickhouse/task_queue/ddl - - - 0 - \ No newline at end of file diff --git a/dbms/tests/integration/test_cluster_copier/configs/users.xml b/dbms/tests/integration/test_cluster_copier/configs/users.xml index 1b49e3871f2..9aa2977daeb 100644 --- a/dbms/tests/integration/test_cluster_copier/configs/users.xml +++ b/dbms/tests/integration/test_cluster_copier/configs/users.xml @@ -6,7 +6,7 @@ 1 - 1 + 0 diff --git a/dbms/tests/integration/test_cluster_copier/task0_description.xml b/dbms/tests/integration/test_cluster_copier/task0_description.xml index 4edc2fc0ada..3ca3159d772 100644 --- a/dbms/tests/integration/test_cluster_copier/task0_description.xml +++ b/dbms/tests/integration/test_cluster_copier/task0_description.xml @@ -59,8 +59,6 @@ - - 0 diff --git a/dbms/tests/integration/test_cluster_copier/test.py b/dbms/tests/integration/test_cluster_copier/test.py index 880ebd4e9ba..bf07b0263f4 100644 --- a/dbms/tests/integration/test_cluster_copier/test.py +++ b/dbms/tests/integration/test_cluster_copier/test.py @@ -14,7 +14,7 @@ sys.path.insert(0, os.path.dirname(CURRENT_TEST_DIR)) from helpers.cluster import ClickHouseCluster from helpers.test_tools import TSV -COPYING_FAIL_PROBABILITY = 0.5 +COPYING_FAIL_PROBABILITY = 0.33 cluster = None @pytest.fixture(scope="module") @@ -48,7 +48,7 @@ def started_cluster(): finally: pass - #cluster.shutdown() + cluster.shutdown() def _test_copying(cmd_options): @@ -105,6 +105,10 @@ def _test_copying(cmd_options): assert TSV(cluster.instances['s1_1_0'].query("SELECT DISTINCT d % 2 FROM hits")) == TSV("0\n") zk.delete(zk_task_path, recursive=True) + instance.query("DROP TABLE hits_all ON CLUSTER cluster1") + instance.query("DROP TABLE hits_all ON CLUSTER cluster1") + instance.query("DROP TABLE hits ON CLUSTER cluster0") + instance.query("DROP TABLE hits ON CLUSTER cluster1") def test_copy_simple(started_cluster):