Edit test configs.

src/Common/tests/gtest_merge_configs.cpp

@@ -43,11 +43,8 @@ clickhouse:
     text_log:
         database: system
         table: text_log
-        partition_by:
+        partition_by: {"@remove": "1"}
-            "@remove": "1"
+        engine: "ENGINE MergeTree"
-        engine:
-            - "@replace" : "1"
-            - "ENGINE MergeTree"
         flush_interval_milliseconds: 7500
         level: debug
 )YAML";
@@ -112,11 +109,8 @@ clickhouse:
     text_log :
         database: system
         table: text_log
-        partition_by:
+        partition_by: {"@remove": "1"}
-            "@remove": "1"
+        engine: "ENGINE MergeTree"
-        engine:
-            - "@replace" : "1"
-            - "ENGINE MergeTree"
         flush_interval_milliseconds: 7500
         level: debug
 )YAML";

tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml

@@ -1,18 +1,6 @@
-path:
+path: /var/lib/clickhouse
-  - /var/lib/clickhouse
+tmp_path: /var/lib/clickhouse/tmp/
-  - "@replace": replace
+user_files_path: /var/lib/clickhouse/user_files/
-tmp_path:
+format_schema_path: /var/lib/clickhouse/format_schemas/
-  - /var/lib/clickhouse/tmp/
+access_control_path: /var/lib/clickhouse/access/
-  - "@replace": replace
+top_level_domains_path: /var/lib/clickhouse/top_level_domains/
-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

tests/integration/test_config_xml_yaml_mix/configs/users.yaml

@@ -6,7 +6,6 @@ users:
   default:
     password: ''
     networks:
-      "@replace": replace
       ip: '::/0'
     profile: default
 

tests/integration/test_config_yaml_full/configs/config.d/path.yaml

@@ -1,18 +1,6 @@
-path:
+path: /var/lib/clickhouse
-  - /var/lib/clickhouse
+tmp_path: /var/lib/clickhouse/tmp/
-  - "@replace": replace
+user_files_path: /var/lib/clickhouse/user_files/
-tmp_path:
+format_schema_path: /var/lib/clickhouse/format_schemas/
-  - /var/lib/clickhouse/tmp/
+access_control_path: /var/lib/clickhouse/access/
-  - "@replace": replace
+top_level_domains_path: /var/lib/clickhouse/top_level_domains/
-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

tests/integration/test_config_yaml_full/configs/users.yaml

@@ -6,7 +6,6 @@ users:
   default:
     password: ''
     networks:
-      "@replace": replace
       ip: '::/0'
     profile: default
 

tests/integration/test_config_yaml_main/configs/users.yaml

@@ -6,7 +6,6 @@ users:
   default:
     password: ''
     networks:
-      "@replace": replace
       ip: '::/0'
     profile: default