thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update integration tests

Browse Source
This commit is contained in:
Dmitry Novik 2024-03-20 13:43:18 +01:00
parent f0e7b78f8b
commit b74a0359e5
22 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/helpers/cluster.py
View File

@ -1606,7 +1606,7 @@ class ClickHouseCluster:
with_jdbc_bridge=False, with_jdbc_bridge=False,
with_hive=False, with_hive=False,
with_coredns=False, with_coredns=False,
allow_analyzer=True, use_old_analyzer=False,
hostname=None, hostname=None,
env_variables=None, env_variables=None,
instance_env_variables=False, instance_env_variables=False,
@ -1705,7 +1705,7 @@ class ClickHouseCluster:
with_coredns=with_coredns, with_coredns=with_coredns,
with_cassandra=with_cassandra, with_cassandra=with_cassandra,
with_ldap=with_ldap, with_ldap=with_ldap,
allow_analyzer=allow_analyzer, use_old_analyzer=use_old_analyzer,
server_bin_path=self.server_bin_path, server_bin_path=self.server_bin_path,
odbc_bridge_bin_path=self.odbc_bridge_bin_path, odbc_bridge_bin_path=self.odbc_bridge_bin_path,
library_bridge_bin_path=self.library_bridge_bin_path, library_bridge_bin_path=self.library_bridge_bin_path,
@ -3267,7 +3267,7 @@ class ClickHouseInstance:
with_coredns, with_coredns,
with_cassandra, with_cassandra,
with_ldap, with_ldap,
allow_analyzer, use_old_analyzer,
server_bin_path, server_bin_path,
odbc_bridge_bin_path, odbc_bridge_bin_path,
library_bridge_bin_path, library_bridge_bin_path,
@ -3361,7 +3361,7 @@ class ClickHouseInstance:
self.with_hive = with_hive self.with_hive = with_hive
self.with_coredns = with_coredns self.with_coredns = with_coredns
self.coredns_config_dir = p.abspath(p.join(base_path, "coredns_config")) self.coredns_config_dir = p.abspath(p.join(base_path, "coredns_config"))
self.allow_analyzer = allow_analyzer self.use_old_analyzer = use_old_analyzer
self.main_config_name = main_config_name self.main_config_name = main_config_name
self.users_config_name = users_config_name self.users_config_name = users_config_name
@ -4409,7 +4409,7 @@ class ClickHouseInstance:
write_embedded_config("0_common_instance_users.xml", users_d_dir) write_embedded_config("0_common_instance_users.xml", users_d_dir)
if ( if (
os.environ.get("CLICKHOUSE_USE_OLD_ANALYZER") is not None os.environ.get("CLICKHOUSE_USE_OLD_ANALYZER") is not None
or self.allow_analyzer or self.use_old_analyzer
): ):
write_embedded_config("0_common_enable_analyzer.xml", users_d_dir) write_embedded_config("0_common_enable_analyzer.xml", users_d_dir)

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

@ -10,13 +10,13 @@ node1 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
main_configs=["configs/wide_parts_only.xml", "configs/no_compress_marks.xml"], main_configs=["configs/wide_parts_only.xml", "configs/no_compress_marks.xml"],
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )

6
tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
View File

@ -9,10 +9,10 @@ node1 = cluster.add_instance(
image="clickhouse/clickhouse-server", image="clickhouse/clickhouse-server",
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance("node2", with_zookeeper=True, allow_analyzer=False) node2 = cluster.add_instance("node2", with_zookeeper=True, use_old_analyzer=True)
node3 = cluster.add_instance("node3", with_zookeeper=True, allow_analyzer=False) node3 = cluster.add_instance("node3", with_zookeeper=True, use_old_analyzer=True)
@pytest.fixture(scope="module") @pytest.fixture(scope="module")

8
tests/integration/test_backward_compatibility/test_aggregate_function_state.py
View File

@ -10,7 +10,7 @@ node1 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
@ -19,10 +19,10 @@ node2 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node3 = cluster.add_instance("node3", with_zookeeper=False, allow_analyzer=False) node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
node4 = cluster.add_instance("node4", with_zookeeper=False, allow_analyzer=False) node4 = cluster.add_instance("node4", with_zookeeper=False, use_old_analyzer=True)
@pytest.fixture(scope="module") @pytest.fixture(scope="module")

4
tests/integration/test_backward_compatibility/test_insert_profile_events.py
View File

@ -7,13 +7,13 @@ import pytest
from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
cluster = ClickHouseCluster(__file__) cluster = ClickHouseCluster(__file__)
upstream_node = cluster.add_instance("upstream_node", allow_analyzer=False) upstream_node = cluster.add_instance("upstream_node", use_old_analyzer=True)
old_node = cluster.add_instance( old_node = cluster.add_instance(
"old_node", "old_node",
image="clickhouse/clickhouse-server", image="clickhouse/clickhouse-server",
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )

2
tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py
View File

@ -10,7 +10,7 @@ node = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )

6
tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py
View File

@ -10,7 +10,7 @@ node1 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
@ -19,9 +19,9 @@ node2 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node3 = cluster.add_instance("node3", with_zookeeper=False, allow_analyzer=False) node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
@pytest.fixture(scope="module") @pytest.fixture(scope="module")

4
tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
View File

@ -3,7 +3,7 @@ import pytest
from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
cluster = ClickHouseCluster(__file__) cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance("node1", with_zookeeper=False, allow_analyzer=False) node1 = cluster.add_instance("node1", with_zookeeper=False, use_old_analyzer=True)
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
with_zookeeper=False, with_zookeeper=False,
@ -11,7 +11,7 @@ node2 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )

4
tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
View File

@ -3,7 +3,7 @@ import pytest
from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
cluster = ClickHouseCluster(__file__) cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance("node1", with_zookeeper=False, allow_analyzer=False) node1 = cluster.add_instance("node1", with_zookeeper=False, use_old_analyzer=True)
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
with_zookeeper=False, with_zookeeper=False,
@ -11,7 +11,7 @@ node2 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )

6
tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
View File

@ -10,7 +10,7 @@ node1 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
@ -19,9 +19,9 @@ node2 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node3 = cluster.add_instance("node3", with_zookeeper=False, allow_analyzer=False) node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
@pytest.fixture(scope="module") @pytest.fixture(scope="module")

4
tests/integration/test_backward_compatibility/test_vertical_merges_from_compact_parts.py
View File

@ -11,7 +11,7 @@ node_old = cluster.add_instance(
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node_new = cluster.add_instance( node_new = cluster.add_instance(
"node2", "node2",
@ -21,7 +21,7 @@ node_new = cluster.add_instance(
], ],
with_zookeeper=True, with_zookeeper=True,
stay_alive=True, stay_alive=True,
allow_analyzer=False, use_old_analyzer=True,
) )

8
tests/integration/test_disk_over_web_server/test.py
View File

@ -13,7 +13,7 @@ def cluster():
"node1", "node1",
main_configs=["configs/storage_conf.xml"], main_configs=["configs/storage_conf.xml"],
with_nginx=True, with_nginx=True,
allow_analyzer=False, use_old_analyzer=True,
) )
cluster.add_instance( cluster.add_instance(
"node2", "node2",
@ -21,14 +21,14 @@ def cluster():
with_nginx=True, with_nginx=True,
stay_alive=True, stay_alive=True,
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )
cluster.add_instance( cluster.add_instance(
"node3", "node3",
main_configs=["configs/storage_conf_web.xml"], main_configs=["configs/storage_conf_web.xml"],
with_nginx=True, with_nginx=True,
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )
cluster.add_instance( cluster.add_instance(
@ -39,7 +39,7 @@ def cluster():
with_installed_binary=True, with_installed_binary=True,
image="clickhouse/clickhouse-server", image="clickhouse/clickhouse-server",
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
allow_analyzer=False, use_old_analyzer=True,
) )
cluster.start() cluster.start()

2
tests/integration/test_distributed_insert_backward_compatibility/test.py
View File

@ -14,7 +14,7 @@ node_dist = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )

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

@ -8,13 +8,13 @@ node1 = cluster.add_instance(
"node1", "node1",
main_configs=["configs/clusters.xml"], main_configs=["configs/clusters.xml"],
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
main_configs=["configs/clusters.xml"], main_configs=["configs/clusters.xml"],
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )

4
tests/integration/test_groupBitmapAnd_on_distributed/test_groupBitmapAndState_on_distributed_table.py
View File

@ -8,13 +8,13 @@ node1 = cluster.add_instance(
"node1", "node1",
main_configs=["configs/clusters.xml"], main_configs=["configs/clusters.xml"],
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
main_configs=["configs/clusters.xml"], main_configs=["configs/clusters.xml"],
with_zookeeper=True, with_zookeeper=True,
allow_analyzer=False, use_old_analyzer=True,
) )

2
tests/integration/test_old_versions/test.py
View File

@ -10,7 +10,7 @@ node_oldest = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
with_installed_binary=True, with_installed_binary=True,
main_configs=["configs/config.d/test_cluster.xml"], main_configs=["configs/config.d/test_cluster.xml"],
allow_analyzer=False, use_old_analyzer=True,
) )
old_nodes = [node_oldest] old_nodes = [node_oldest]
new_node = cluster.add_instance("node_new") new_node = cluster.add_instance("node_new")

2
tests/integration/test_polymorphic_parts/test.py
View File

@ -369,7 +369,7 @@ node7 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node8 = cluster.add_instance( node8 = cluster.add_instance(
"node8", "node8",

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

@ -9,7 +9,7 @@ node1 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
@ -18,7 +18,7 @@ node2 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )

2
tests/integration/test_storage_s3_queue/test.py
View File

@ -108,7 +108,7 @@ def started_cluster():
tag="23.12", tag="23.12",
stay_alive=True, stay_alive=True,
with_installed_binary=True, with_installed_binary=True,
allow_analyzer=False, use_old_analyzer=True,
) )
logging.info("Starting cluster...") logging.info("Starting cluster...")

6
tests/integration/test_ttl_replicated/test.py
View File

@ -23,7 +23,7 @@ node4 = cluster.add_instance(
main_configs=[ main_configs=[
"configs/compat.xml", "configs/compat.xml",
], ],
allow_analyzer=False, use_old_analyzer=True,
) )
node5 = cluster.add_instance( node5 = cluster.add_instance(
@ -36,7 +36,7 @@ node5 = cluster.add_instance(
main_configs=[ main_configs=[
"configs/compat.xml", "configs/compat.xml",
], ],
allow_analyzer=False, use_old_analyzer=True,
) )
node6 = cluster.add_instance( node6 = cluster.add_instance(
"node6", "node6",
@ -48,7 +48,7 @@ node6 = cluster.add_instance(
main_configs=[ main_configs=[
"configs/compat.xml", "configs/compat.xml",
], ],
allow_analyzer=False, use_old_analyzer=True,
) )

2
tests/integration/test_version_update/test.py
View File

@ -14,7 +14,7 @@ node2 = cluster.add_instance(
tag=CLICKHOUSE_CI_MIN_TESTED_VERSION, tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
with_installed_binary=True, with_installed_binary=True,
stay_alive=True, stay_alive=True,
allow_analyzer=False, use_old_analyzer=True,
) )

6
tests/integration/test_version_update_after_mutation/test.py
View File

@ -16,7 +16,7 @@ node1 = cluster.add_instance(
main_configs=[ main_configs=[
"configs/compat.xml", "configs/compat.xml",
], ],
allow_analyzer=False, use_old_analyzer=True,
) )
node2 = cluster.add_instance( node2 = cluster.add_instance(
"node2", "node2",
@ -28,7 +28,7 @@ node2 = cluster.add_instance(
main_configs=[ main_configs=[
"configs/compat.xml", "configs/compat.xml",
], ],
allow_analyzer=False, use_old_analyzer=True,
) )
node3 = cluster.add_instance( node3 = cluster.add_instance(
"node3", "node3",
@ -40,7 +40,7 @@ node3 = cluster.add_instance(
main_configs=[ main_configs=[
"configs/compat.xml", "configs/compat.xml",
], ],
allow_analyzer=False, use_old_analyzer=True,
) )