Skip to content

24.8 Attempt to fix some integration tests #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2024
Merged

24.8 Attempt to fix some integration tests #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8efc429
Attempt to fix some integration tests
Enmk Oct 8, 2024
b28f6c3
Using bottle 0.13
Enmk Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/test/integration/resolver/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bottle~=0.12.25
bottle~=0.13
packaging~=24.1
pip~=23.2.1
pipdeptree~=2.23.0
Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_distributed_inter_server_secret/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def make_instance(name, *args, **kwargs):
main_configs.append("configs/remote_servers.xml")
user_configs = kwargs.pop("user_configs", [])
user_configs.append("configs/users.xml")

return cluster.add_instance(
name,
with_zookeeper=True,
Expand Down
1 change: 1 addition & 0 deletions ...gration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<default>
<enable_analyzer>1</enable_analyzer>
<allow_experimental_parallel_reading_from_replicas>1</allow_experimental_parallel_reading_from_replicas>
<allow_experimental_database_replicated>1</allow_experimental_database_replicated>
<cluster_for_parallel_replicas>default</cluster_for_parallel_replicas>
<max_parallel_replicas>100</max_parallel_replicas>
<use_hedged_requests>0</use_hedged_requests>
Expand Down
11 changes: 11 additions & 0 deletions tests/integration/test_storage_s3_queue/configs/users_old.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<clickhouse>
<profiles>
<default>
<stream_like_engine_allow_direct_select>1</stream_like_engine_allow_direct_select>
<s3queue_enable_logging_to_s3queue_log>1</s3queue_enable_logging_to_s3queue_log>
<!-- Used for pre-24.3 version, where this particular option is not available -->
<!-- <s3queue_allow_experimental_sharded_mode>1</s3queue_allow_experimental_sharded_mode> -->
<allow_experimental_s3queue>1</allow_experimental_s3queue>
</default>
</profiles>
</clickhouse>
2 changes: 2 additions & 0 deletions tests/integration/test_storage_s3_queue/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ def started_cluster():
)
cluster.add_instance(
"old_instance",
user_configs=["configs/users_old.xml"],
with_zookeeper=True,
# NOTE (vnemkov) Can't use altinity/clickhouse here since 23.8 doesn't hve S3Queue (and associated settings yet)
image="clickhouse/clickhouse-server",
tag="23.12",
stay_alive=True,
Expand Down
Loading