From 63e992d52d3e71fc8e3491a995732e68c9be204f Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Tue, 6 Sep 2022 13:47:07 +0200
Subject: [PATCH] Edit test configs.

---
 src/Common/tests/gtest_merge_configs.cpp      | 14 ++++-------
 .../configs/config.d/path.yaml                | 24 +++++--------------
 .../configs/users.yaml                        |  1 -
 .../configs/config.d/path.yaml                | 24 +++++--------------
 .../test_config_yaml_full/configs/users.yaml  |  1 -
 .../test_config_yaml_main/configs/users.yaml  |  1 -
 6 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/src/Common/tests/gtest_merge_configs.cpp b/src/Common/tests/gtest_merge_configs.cpp
index 293de60f7f6..2cc7f4a99af 100644
--- a/src/Common/tests/gtest_merge_configs.cpp
+++ b/src/Common/tests/gtest_merge_configs.cpp
@@ -43,11 +43,8 @@ clickhouse:
     text_log:
         database: system
         table: text_log
-        partition_by:
-            "@remove": "1"
-        engine:
-            - "@replace" : "1"
-            - "ENGINE MergeTree"
+        partition_by: {"@remove": "1"}
+        engine: "ENGINE MergeTree"
         flush_interval_milliseconds: 7500
         level: debug
 )YAML";
@@ -112,11 +109,8 @@ clickhouse:
     text_log :
         database: system
         table: text_log
-        partition_by:
-            "@remove": "1"
-        engine:
-            - "@replace" : "1"
-            - "ENGINE MergeTree"
+        partition_by: {"@remove": "1"}
+        engine: "ENGINE MergeTree"
         flush_interval_milliseconds: 7500
         level: debug
 )YAML";
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
index 7fd5b1a0478..de0fefd2f48 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
@@ -1,18 +1,6 @@
-path:
-  - /var/lib/clickhouse
-  - "@replace": replace
-tmp_path:
-  - /var/lib/clickhouse/tmp/
-  - "@replace": replace
-user_files_path:
-  - /var/lib/clickhouse/user_files/
-  - "@replace": replace
-format_schema_path:
-  - /var/lib/clickhouse/format_schemas/
-  - "@replace": replace
-access_control_path:
-  - /var/lib/clickhouse/access/
-  - "@replace": replace
-top_level_domains_path:
-  - /var/lib/clickhouse/top_level_domains/
-  - "@replace": replace
+path: /var/lib/clickhouse
+tmp_path: /var/lib/clickhouse/tmp/
+user_files_path: /var/lib/clickhouse/user_files/
+format_schema_path: /var/lib/clickhouse/format_schemas/
+access_control_path: /var/lib/clickhouse/access/
+top_level_domains_path: /var/lib/clickhouse/top_level_domains/
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/users.yaml b/tests/integration/test_config_xml_yaml_mix/configs/users.yaml
index a87a8c82819..7a28807949f 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/users.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/users.yaml
@@ -6,7 +6,6 @@ users:
   default:
     password: ''
     networks:
-      "@replace": replace
       ip: '::/0'
     profile: default
 
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/path.yaml b/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
index 7fd5b1a0478..de0fefd2f48 100644
--- a/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
@@ -1,18 +1,6 @@
-path:
-  - /var/lib/clickhouse
-  - "@replace": replace
-tmp_path:
-  - /var/lib/clickhouse/tmp/
-  - "@replace": replace
-user_files_path:
-  - /var/lib/clickhouse/user_files/
-  - "@replace": replace
-format_schema_path:
-  - /var/lib/clickhouse/format_schemas/
-  - "@replace": replace
-access_control_path:
-  - /var/lib/clickhouse/access/
-  - "@replace": replace
-top_level_domains_path:
-  - /var/lib/clickhouse/top_level_domains/
-  - "@replace": replace
+path: /var/lib/clickhouse
+tmp_path: /var/lib/clickhouse/tmp/
+user_files_path: /var/lib/clickhouse/user_files/
+format_schema_path: /var/lib/clickhouse/format_schemas/
+access_control_path: /var/lib/clickhouse/access/
+top_level_domains_path: /var/lib/clickhouse/top_level_domains/
diff --git a/tests/integration/test_config_yaml_full/configs/users.yaml b/tests/integration/test_config_yaml_full/configs/users.yaml
index a87a8c82819..7a28807949f 100644
--- a/tests/integration/test_config_yaml_full/configs/users.yaml
+++ b/tests/integration/test_config_yaml_full/configs/users.yaml
@@ -6,7 +6,6 @@ users:
   default:
     password: ''
     networks:
-      "@replace": replace
       ip: '::/0'
     profile: default
 
diff --git a/tests/integration/test_config_yaml_main/configs/users.yaml b/tests/integration/test_config_yaml_main/configs/users.yaml
index a87a8c82819..7a28807949f 100644
--- a/tests/integration/test_config_yaml_main/configs/users.yaml
+++ b/tests/integration/test_config_yaml_main/configs/users.yaml
@@ -6,7 +6,6 @@ users:
   default:
     password: ''
     networks:
-      "@replace": replace
       ip: '::/0'
     profile: default