From 75fca08b2a15c702884aa760fbca3389c974bea3 Mon Sep 17 00:00:00 2001
From: Nicolae Vartolomei <nv@cloudflare.com>
Date: Thu, 4 Feb 2021 17:26:53 +0000
Subject: [PATCH] Update test_replicated_fetches_network_partition with new
 settings

---
 .../configs/merge_tree.xml                               | 6 ++++++
 .../configs/profiles.xml                                 | 9 ---------
 .../test_replicated_fetches_network_partition/test.py    | 2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 100644 tests/integration/test_replicated_fetches_network_partition/configs/merge_tree.xml
 delete mode 100644 tests/integration/test_replicated_fetches_network_partition/configs/profiles.xml

diff --git a/tests/integration/test_replicated_fetches_network_partition/configs/merge_tree.xml b/tests/integration/test_replicated_fetches_network_partition/configs/merge_tree.xml
new file mode 100644
index 00000000000..eba2c5e8ffc
--- /dev/null
+++ b/tests/integration/test_replicated_fetches_network_partition/configs/merge_tree.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <merge_tree>
+        <replicated_fetches_http_connection_timeout>30</replicated_fetches_http_connection_timeout>
+        <replicated_fetches_http_receive_timeout>1</replicated_fetches_http_receive_timeout>
+    </merge_tree>
+</yandex>
diff --git a/tests/integration/test_replicated_fetches_network_partition/configs/profiles.xml b/tests/integration/test_replicated_fetches_network_partition/configs/profiles.xml
deleted file mode 100644
index 7abcf0bfde3..00000000000
--- a/tests/integration/test_replicated_fetches_network_partition/configs/profiles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<yandex>
-    <profiles>
-        <default>
-            <!-- high connection timeout, we want to test failover on reads -->
-            <http_connection_timeout>30</http_connection_timeout>
-<!--            <http_receive_timeout>1</http_receive_timeout>-->
-        </default>
-    </profiles>
-</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_replicated_fetches_network_partition/test.py b/tests/integration/test_replicated_fetches_network_partition/test.py
index e42395c7af4..e493709dcbe 100644
--- a/tests/integration/test_replicated_fetches_network_partition/test.py
+++ b/tests/integration/test_replicated_fetches_network_partition/test.py
@@ -10,7 +10,7 @@ import string
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', with_zookeeper=True)
 node2 = cluster.add_instance('node2', with_zookeeper=True)
-node3 = cluster.add_instance('node3', with_zookeeper=True, user_configs=['configs/profiles.xml'])
+node3 = cluster.add_instance('node3', with_zookeeper=True, main_configs=['configs/merge_tree.xml'])
 
 DEFAULT_MAX_THREADS_FOR_FETCH = 3