Skip to content

Commit 0c245eb

Browse files
committed
Attempt to fix some integration tests
This is a cherry-pick of #493
1 parent d6d24cd commit 0c245eb

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

tests/integration/test_distributed_inter_server_secret/test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def make_instance(name, *args, **kwargs):
1717
main_configs.append("configs/remote_servers.xml")
1818
user_configs = kwargs.pop("user_configs", [])
1919
user_configs.append("configs/users.xml")
20+
2021
return cluster.add_instance(
2122
name,
2223
with_zookeeper=True,

tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<default>
44
<enable_analyzer>1</enable_analyzer>
55
<allow_experimental_parallel_reading_from_replicas>1</allow_experimental_parallel_reading_from_replicas>
6+
<allow_experimental_database_replicated>1</allow_experimental_database_replicated>
67
<cluster_for_parallel_replicas>default</cluster_for_parallel_replicas>
78
<max_parallel_replicas>100</max_parallel_replicas>
89
<use_hedged_requests>0</use_hedged_requests>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<clickhouse>
2+
<profiles>
3+
<default>
4+
<stream_like_engine_allow_direct_select>1</stream_like_engine_allow_direct_select>
5+
<s3queue_enable_logging_to_s3queue_log>1</s3queue_enable_logging_to_s3queue_log>
6+
<!-- Used for pre-24.3 version, where this particular option is not available -->
7+
<!-- <s3queue_allow_experimental_sharded_mode>1</s3queue_allow_experimental_sharded_mode> -->
8+
<allow_experimental_s3queue>1</allow_experimental_s3queue>
9+
</default>
10+
</profiles>
11+
</clickhouse>

tests/integration/test_storage_s3_queue/test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ def started_cluster():
107107
)
108108
cluster.add_instance(
109109
"old_instance",
110+
user_configs=["configs/users_old.xml"],
110111
with_zookeeper=True,
112+
# NOTE (vnemkov) Can't use altinity/clickhouse here since 23.8 doesn't hve S3Queue (and associated settings yet)
111113
image="clickhouse/clickhouse-server",
112114
tag="23.12",
113115
stay_alive=True,

0 commit comments

Comments
 (0)