From 8efc429569d9754ec91c2b635ada24d150bc12e1 Mon Sep 17 00:00:00 2001
From: Vasily Nemkov <V.Nemkov@gmail.com>
Date: Tue, 8 Oct 2024 20:57:20 +0200
Subject: [PATCH 1/2] Attempt to fix some integration tests

This is a cherry-pick of #493
---
 .../test_distributed_inter_server_secret/test.py      |  1 +
 .../configs/enable_parallel_replicas.xml              |  1 +
 .../test_storage_s3_queue/configs/users_old.xml       | 11 +++++++++++
 tests/integration/test_storage_s3_queue/test.py       |  2 ++
 4 files changed, 15 insertions(+)
 create mode 100644 tests/integration/test_storage_s3_queue/configs/users_old.xml

diff --git a/tests/integration/test_distributed_inter_server_secret/test.py b/tests/integration/test_distributed_inter_server_secret/test.py
index d74cf97e5c66..7f5c4c7841c8 100644
--- a/tests/integration/test_distributed_inter_server_secret/test.py
+++ b/tests/integration/test_distributed_inter_server_secret/test.py
@@ -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,
diff --git a/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml b/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml
index 30a0b6276b76..e69df7d39f65 100644
--- a/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml
+++ b/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml
@@ -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>
diff --git a/tests/integration/test_storage_s3_queue/configs/users_old.xml b/tests/integration/test_storage_s3_queue/configs/users_old.xml
new file mode 100644
index 000000000000..227dbe9bde5b
--- /dev/null
+++ b/tests/integration/test_storage_s3_queue/configs/users_old.xml
@@ -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>
diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index 66dad88ccbcc..09a6be1ec191 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -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,

From b28f6c33fd0b47e0a3c9390ae749880819d9299c Mon Sep 17 00:00:00 2001
From: Vasily Nemkov <V.Nemkov@gmail.com>
Date: Mon, 18 Nov 2024 12:58:50 +0000
Subject: [PATCH 2/2] Using bottle 0.13

since it doesn't depend on deprecated (and removed in Python 3.13) `cgi` module
---
 docker/test/integration/resolver/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/integration/resolver/requirements.txt b/docker/test/integration/resolver/requirements.txt
index b0fa4a3b8587..314b112319b3 100644
--- a/docker/test/integration/resolver/requirements.txt
+++ b/docker/test/integration/resolver/requirements.txt
@@ -1,4 +1,4 @@
-bottle~=0.12.25
+bottle~=0.13
 packaging~=24.1
 pip~=23.2.1
 pipdeptree~=2.23.0