diff --git a/docker/test/integration/runner/dockerd-entrypoint.sh b/docker/test/integration/runner/dockerd-entrypoint.sh index a850a3a9086..a04a88f541d 100755 --- a/docker/test/integration/runner/dockerd-entrypoint.sh +++ b/docker/test/integration/runner/dockerd-entrypoint.sh @@ -1,6 +1,7 @@ #!/bin/bash set -e +mkdir -p /etc/docker/ cat > /etc/docker/daemon.json << EOF { "ipv6": true, diff --git a/tests/integration/test_adaptive_granularity/test.py b/tests/integration/test_adaptive_granularity/test.py index 2ea2f29212f..f10bfddb01b 100644 --- a/tests/integration/test_adaptive_granularity/test.py +++ b/tests/integration/test_adaptive_granularity/test.py @@ -30,6 +30,12 @@ def prepare_single_pair_with_setting(first_node, second_node, group): for node in (first_node, second_node): node.query("CREATE DATABASE IF NOT EXISTS test") + first_node.query("DROP TABLE IF EXISTS table_by_default") + second_node.query("DROP TABLE IF EXISTS table_by_default") + first_node.query("DROP TABLE IF EXISTS table_with_fixed_granularity") + second_node.query("DROP TABLE IF EXISTS table_with_fixed_granularity") + + # Two tables with adaptive granularity first_node.query( ''' diff --git a/tests/integration/test_allowed_client_hosts/test.py b/tests/integration/test_allowed_client_hosts/test.py index cf83718e25c..7b803fd50f3 100644 --- a/tests/integration/test_allowed_client_hosts/test.py +++ b/tests/integration/test_allowed_client_hosts/test.py @@ -37,8 +37,9 @@ def query(node, query): def setup_nodes(): try: cluster.start() - query(server, "CREATE TABLE test_table (x Int32) ENGINE = MergeTree() ORDER BY tuple()") - query(server, "INSERT INTO test_table VALUES (5)") + query(server, "DROP TABLE IF EXISTS test_allowed_client_hosts") + query(server, "CREATE TABLE test_allowed_client_hosts (x Int32) ENGINE = MergeTree() ORDER BY tuple()") + query(server, "INSERT INTO test_allowed_client_hosts VALUES (5)") yield cluster @@ -57,8 +58,8 @@ def test_allowed_host(): # expected_to_fail.extend([clientC3, clientD2]) for client_node in expected_to_pass: - assert query_from_one_node_to_another(client_node, server, "SELECT * FROM test_table") == "5\n" + assert query_from_one_node_to_another(client_node, server, "SELECT * FROM test_allowed_client_hosts") == "5\n" for client_node in expected_to_fail: with pytest.raises(Exception, match=r'default: Authentication failed'): - query_from_one_node_to_another(client_node, server, "SELECT * FROM test_table") + query_from_one_node_to_another(client_node, server, "SELECT * FROM test_allowed_client_hosts") diff --git a/tests/integration/test_dictionaries_redis/configs/dictionaries/.gitkeep b/tests/integration/test_dictionaries_redis/configs/dictionaries/.gitkeep deleted file mode 100644 index c693f138c81..00000000000 --- a/tests/integration/test_dictionaries_redis/configs/dictionaries/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -keep \ No newline at end of file