diff --git a/programs/diagnostics/internal/platform/data/file_test.go b/programs/diagnostics/internal/platform/data/file_test.go index d273987d327..b93c4fc3350 100644 --- a/programs/diagnostics/internal/platform/data/file_test.go +++ b/programs/diagnostics/internal/platform/data/file_test.go @@ -133,11 +133,11 @@ func TestConfigFileFrameCopy(t *testing.T) { require.Empty(t, errs) i := 0 sizes := map[string]int64{ - "users.xml": int64(2039), + "users.xml": int64(2017), "default-password.xml": int64(188), - "config.xml": int64(61282), + "config.xml": int64(61260), "server-include.xml": int64(168), - "user-include.xml": int64(582), + "user-include.xml": int64(559), } var checkedFiles []string for { diff --git a/programs/diagnostics/testdata/configs/include/xml/user-include.xml b/programs/diagnostics/testdata/configs/include/xml/user-include.xml index 01dc5e2da19..b12b34a56bb 100644 --- a/programs/diagnostics/testdata/configs/include/xml/user-include.xml +++ b/programs/diagnostics/testdata/configs/include/xml/user-include.xml @@ -1,4 +1,3 @@ - diff --git a/programs/diagnostics/testdata/configs/xml/config.xml b/programs/diagnostics/testdata/configs/xml/config.xml index a41c3b8c04e..18997855955 100644 --- a/programs/diagnostics/testdata/configs/xml/config.xml +++ b/programs/diagnostics/testdata/configs/xml/config.xml @@ -1,4 +1,3 @@ - diff --git a/programs/diagnostics/testdata/configs/yandex_xml/config.xml b/programs/diagnostics/testdata/configs/yandex_xml/config.xml index 5133ce93ae5..8854754fc3c 100644 --- a/programs/diagnostics/testdata/configs/yandex_xml/config.xml +++ b/programs/diagnostics/testdata/configs/yandex_xml/config.xml @@ -1,4 +1,3 @@ - diff --git a/programs/server/users.d/allow_introspection_functions.xml b/programs/server/users.d/allow_introspection_functions.xml index cfde1b4525d..ec3057c82d7 100644 --- a/programs/server/users.d/allow_introspection_functions.xml +++ b/programs/server/users.d/allow_introspection_functions.xml @@ -1,4 +1,3 @@ - diff --git a/programs/server/users.d/allow_only_from_localhost.xml b/programs/server/users.d/allow_only_from_localhost.xml index b1b38686133..406b89b4d7c 100644 --- a/programs/server/users.d/allow_only_from_localhost.xml +++ b/programs/server/users.d/allow_only_from_localhost.xml @@ -1,4 +1,3 @@ - diff --git a/programs/server/users.xml b/programs/server/users.xml index 67858c0f3eb..5e2ff51bf4d 100644 --- a/programs/server/users.xml +++ b/programs/server/users.xml @@ -1,4 +1,3 @@ - diff --git a/src/Common/tests/gtest_getMultipleValuesFromConfig.cpp b/src/Common/tests/gtest_getMultipleValuesFromConfig.cpp index e813cf4c75c..51c28ed43e9 100644 --- a/src/Common/tests/gtest_getMultipleValuesFromConfig.cpp +++ b/src/Common/tests/gtest_getMultipleValuesFromConfig.cpp @@ -10,8 +10,7 @@ using namespace DB; TEST(Common, getMultipleValuesFromConfig) { std::istringstream // STYLE_CHECK_ALLOW_STD_STRING_STREAM - xml_isteam(R"END( - + xml_isteam(R"END( 0 1 diff --git a/src/Common/tests/gtest_sensitive_data_masker.cpp b/src/Common/tests/gtest_sensitive_data_masker.cpp index b8eb270090b..1b13f475363 100644 --- a/src/Common/tests/gtest_sensitive_data_masker.cpp +++ b/src/Common/tests/gtest_sensitive_data_masker.cpp @@ -60,24 +60,6 @@ TEST(Common, SensitiveDataMasker) "SELECT id FROM mysql('localhost:3308', 'database', 'table', 'root', '******') WHERE " "ssn='000-00-0000' or email='hidden@hidden.test'"); -#ifndef NDEBUG - // simple benchmark - auto start = std::chrono::high_resolution_clock::now(); - static constexpr size_t iterations = 200000; - for (int i = 0; i < iterations; ++i) - { - std::string query2 = "SELECT id FROM mysql('localhost:3308', 'database', 'table', 'root', 'qwerty123') WHERE ssn='123-45-6789' or " - "email='JonhSmith@secret.domain.test'"; - masker2.wipeSensitiveData(query2); - } - auto finish = std::chrono::high_resolution_clock::now(); - std::chrono::duration elapsed = finish - start; - std::cout << "Elapsed time: " << elapsed.count() << "s per " << iterations <<" calls (" << elapsed.count() * 1000000 / iterations << "µs per call)" - << std::endl; - // I have: "Elapsed time: 3.44022s per 200000 calls (17.2011µs per call)" - masker2.printStats(); -#endif - DB::SensitiveDataMasker maskerbad(*empty_xml_config , ""); // gtest has not good way to check exception content, so just do it manually (see https://github.com/google/googletest/issues/952 ) @@ -104,8 +86,7 @@ TEST(Common, SensitiveDataMasker) try { std::istringstream // STYLE_CHECK_ALLOW_STD_STRING_STREAM - xml_isteam_bad(R"END( - + xml_isteam(R"END( test @@ -118,7 +99,7 @@ TEST(Common, SensitiveDataMasker) )END"); - Poco::AutoPtr xml_config = new Poco::Util::XMLConfiguration(xml_isteam_bad); + Poco::AutoPtr xml_config = new Poco::Util::XMLConfiguration(xml_isteam); DB::SensitiveDataMasker masker_xml_based_exception_check(*xml_config, "query_masking_rules"); ADD_FAILURE() << "XML should throw an error on bad XML" << std::endl; @@ -134,14 +115,13 @@ TEST(Common, SensitiveDataMasker) try { std::istringstream // STYLE_CHECK_ALLOW_STD_STRING_STREAM - xml_isteam_bad(R"END( - + xml_isteam(R"END( test )END"); - Poco::AutoPtr xml_config = new Poco::Util::XMLConfiguration(xml_isteam_bad); + Poco::AutoPtr xml_config = new Poco::Util::XMLConfiguration(xml_isteam); DB::SensitiveDataMasker masker_xml_based_exception_check(*xml_config, "query_masking_rules"); ADD_FAILURE() << "XML should throw an error on bad XML" << std::endl; @@ -157,14 +137,13 @@ TEST(Common, SensitiveDataMasker) try { std::istringstream // STYLE_CHECK_ALLOW_STD_STRING_STREAM - xml_isteam_bad(R"END( - + xml_isteam(R"END( test())( )END"); - Poco::AutoPtr xml_config = new Poco::Util::XMLConfiguration(xml_isteam_bad); + Poco::AutoPtr xml_config = new Poco::Util::XMLConfiguration(xml_isteam); DB::SensitiveDataMasker masker_xml_based_exception_check(*xml_config, "query_masking_rules"); ADD_FAILURE() << "XML should throw an error on bad XML" << std::endl; @@ -180,7 +159,7 @@ TEST(Common, SensitiveDataMasker) { std::istringstream // STYLE_CHECK_ALLOW_STD_STRING_STREAM - xml_isteam(R"END( + xml_isteam(R"END( diff --git a/tests/config/config.d/nlp.xml b/tests/config/config.d/nlp.xml index 740054674ba..8c5d82ee7c9 100644 --- a/tests/config/config.d/nlp.xml +++ b/tests/config/config.d/nlp.xml @@ -1,4 +1,3 @@ - diff --git a/tests/config/config.d/query_masking_rules.xml b/tests/config/config.d/query_masking_rules.xml index 690d62b9a2b..b26c0b01888 100644 --- a/tests/config/config.d/query_masking_rules.xml +++ b/tests/config/config.d/query_masking_rules.xml @@ -1,4 +1,3 @@ - diff --git a/tests/config/users.d/readonly.xml b/tests/config/users.d/readonly.xml index 8e463205348..0fe1e3fe6d9 100644 --- a/tests/config/users.d/readonly.xml +++ b/tests/config/users.d/readonly.xml @@ -1,4 +1,3 @@ - diff --git a/tests/config/users.d/session_log_test.xml b/tests/config/users.d/session_log_test.xml index 1cd8aadfd09..daddaa6e4b9 100644 --- a/tests/config/users.d/session_log_test.xml +++ b/tests/config/users.d/session_log_test.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/helpers/0_common_enable_dictionaries.xml b/tests/integration/helpers/0_common_enable_dictionaries.xml index c7a763eb942..fee13e3b564 100644 --- a/tests/integration/helpers/0_common_enable_dictionaries.xml +++ b/tests/integration/helpers/0_common_enable_dictionaries.xml @@ -1,4 +1,3 @@ - /etc/clickhouse-server/dictionaries/*.xml diff --git a/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml b/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml index 6c55d61481a..3201ec36f8c 100644 --- a/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml +++ b/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_alter_update_cast_keep_nullable/configs/users.xml b/tests/integration/test_alter_update_cast_keep_nullable/configs/users.xml index f38096f37fc..f436c4e3380 100644 --- a/tests/integration/test_alter_update_cast_keep_nullable/configs/users.xml +++ b/tests/integration/test_alter_update_cast_keep_nullable/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_async_drain_connection/configs/config.xml b/tests/integration/test_async_drain_connection/configs/config.xml index da3c4f171c4..88862a3001e 100644 --- a/tests/integration/test_async_drain_connection/configs/config.xml +++ b/tests/integration/test_async_drain_connection/configs/config.xml @@ -1,4 +1,3 @@ - 10000 diff --git a/tests/integration/test_backup_restore_new/configs/backups_disk.xml b/tests/integration/test_backup_restore_new/configs/backups_disk.xml index a589610f600..f7d666c6542 100644 --- a/tests/integration/test_backup_restore_new/configs/backups_disk.xml +++ b/tests/integration/test_backup_restore_new/configs/backups_disk.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_backup_restore_on_cluster/configs/backups_disk.xml b/tests/integration/test_backup_restore_on_cluster/configs/backups_disk.xml index beb8d605f39..b99a51cd56d 100644 --- a/tests/integration/test_backup_restore_on_cluster/configs/backups_disk.xml +++ b/tests/integration/test_backup_restore_on_cluster/configs/backups_disk.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_backup_restore_on_cluster/configs/lesser_timeouts.xml b/tests/integration/test_backup_restore_on_cluster/configs/lesser_timeouts.xml index 9caf52fcca4..5878cd5c41f 100644 --- a/tests/integration/test_backup_restore_on_cluster/configs/lesser_timeouts.xml +++ b/tests/integration/test_backup_restore_on_cluster/configs/lesser_timeouts.xml @@ -1,4 +1,3 @@ - 1000 diff --git a/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml index ebb914f54b0..07363e6e43a 100644 --- a/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml +++ b/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml b/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml index 64ee762fc2c..c91ec627580 100644 --- a/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml +++ b/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/configs/users.xml b/tests/integration/test_cluster_copier/configs/users.xml index 2542642f6df..b463dfc81e7 100644 --- a/tests/integration/test_cluster_copier/configs/users.xml +++ b/tests/integration/test_cluster_copier/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml index 8105afb155b..9de7b57de27 100644 --- a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml +++ b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml index 4f5a6a6d1f5..64fa32335ab 100644 --- a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml +++ b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml @@ -1,4 +1,3 @@ - /clickhouse/task_queue/ddl diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml b/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml index fd79d8850d8..d0cab0fafb7 100644 --- a/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml +++ b/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml @@ -1,4 +1,3 @@ - information diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/users.xml b/tests/integration/test_cluster_copier/configs_three_nodes/users.xml index f017daff974..badaf46a5ca 100644 --- a/tests/integration/test_cluster_copier/configs_three_nodes/users.xml +++ b/tests/integration/test_cluster_copier/configs_three_nodes/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml index b46faf9b0b7..38d88308631 100644 --- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml +++ b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml index 4f5a6a6d1f5..64fa32335ab 100644 --- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml +++ b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml @@ -1,4 +1,3 @@ - /clickhouse/task_queue/ddl diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml b/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml index d65ab52807d..55bd24816ae 100644 --- a/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml +++ b/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml @@ -1,4 +1,3 @@ - information diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/users.xml b/tests/integration/test_cluster_copier/configs_two_nodes/users.xml index f017daff974..badaf46a5ca 100644 --- a/tests/integration/test_cluster_copier/configs_two_nodes/users.xml +++ b/tests/integration/test_cluster_copier/configs_two_nodes/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/task0_description.xml b/tests/integration/test_cluster_copier/task0_description.xml index 9b903444741..8d74d0bdde0 100644 --- a/tests/integration/test_cluster_copier/task0_description.xml +++ b/tests/integration/test_cluster_copier/task0_description.xml @@ -1,4 +1,3 @@ - 3 diff --git a/tests/integration/test_cluster_copier/task_drop_target_partition.xml b/tests/integration/test_cluster_copier/task_drop_target_partition.xml index df39009f7f1..dc8e6452243 100644 --- a/tests/integration/test_cluster_copier/task_drop_target_partition.xml +++ b/tests/integration/test_cluster_copier/task_drop_target_partition.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/task_month_to_week_description.xml b/tests/integration/test_cluster_copier/task_month_to_week_description.xml index 6839ba930aa..bc290ca397f 100644 --- a/tests/integration/test_cluster_copier/task_month_to_week_description.xml +++ b/tests/integration/test_cluster_copier/task_month_to_week_description.xml @@ -1,4 +1,3 @@ - 4 diff --git a/tests/integration/test_cluster_copier/task_self_copy.xml b/tests/integration/test_cluster_copier/task_self_copy.xml index 4d56369233a..fb8eaa775cd 100644 --- a/tests/integration/test_cluster_copier/task_self_copy.xml +++ b/tests/integration/test_cluster_copier/task_self_copy.xml @@ -1,4 +1,3 @@ - 9440 diff --git a/tests/integration/test_cluster_copier/task_skip_index.xml b/tests/integration/test_cluster_copier/task_skip_index.xml index 13e80086ea8..b04cec963d4 100644 --- a/tests/integration/test_cluster_copier/task_skip_index.xml +++ b/tests/integration/test_cluster_copier/task_skip_index.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/task_taxi_data.xml b/tests/integration/test_cluster_copier/task_taxi_data.xml index 554621cea21..94fa5087338 100644 --- a/tests/integration/test_cluster_copier/task_taxi_data.xml +++ b/tests/integration/test_cluster_copier/task_taxi_data.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/task_test_block_size.xml b/tests/integration/test_cluster_copier/task_test_block_size.xml index 1c7fc5d0363..bf29c7e1832 100644 --- a/tests/integration/test_cluster_copier/task_test_block_size.xml +++ b/tests/integration/test_cluster_copier/task_test_block_size.xml @@ -1,4 +1,3 @@ - 1 diff --git a/tests/integration/test_cluster_copier/task_trivial.xml b/tests/integration/test_cluster_copier/task_trivial.xml index c1531e904c5..a3b8bc03888 100644 --- a/tests/integration/test_cluster_copier/task_trivial.xml +++ b/tests/integration/test_cluster_copier/task_trivial.xml @@ -1,4 +1,3 @@ - 3 diff --git a/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml b/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml index 27a2b084148..0197dee0181 100644 --- a/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml +++ b/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml @@ -1,4 +1,3 @@ - 3 diff --git a/tests/integration/test_cluster_copier/task_ttl_columns.xml b/tests/integration/test_cluster_copier/task_ttl_columns.xml index d1fbf5f8be6..2069c509c87 100644 --- a/tests/integration/test_cluster_copier/task_ttl_columns.xml +++ b/tests/integration/test_cluster_copier/task_ttl_columns.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml b/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml index 63d2865f7f9..2a51fa7a66d 100644 --- a/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml +++ b/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_cluster_copier/task_with_different_schema.xml b/tests/integration/test_cluster_copier/task_with_different_schema.xml index eb5bf7d5945..e1e6ee4dc42 100644 --- a/tests/integration/test_cluster_copier/task_with_different_schema.xml +++ b/tests/integration/test_cluster_copier/task_with_different_schema.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_codec_encrypted/test.py b/tests/integration/test_codec_encrypted/test.py index ebe837c9e3a..64b8bf29640 100644 --- a/tests/integration/test_codec_encrypted/test.py +++ b/tests/integration/test_codec_encrypted/test.py @@ -24,7 +24,6 @@ def make_storage_with_key(id): "bash", "-c", """cat > /etc/clickhouse-server/config.d/storage_keys_config.xml << EOF - diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_default.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_default.xml index 6c1f8f33de1..a63e91f41fb 100644 --- a/tests/integration/test_concurrent_threads_soft_limit/configs/config_default.xml +++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_default.xml @@ -1,4 +1,3 @@ - system diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_1.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_1.xml index 5f93f2dc319..43d9d9ecf2d 100644 --- a/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_1.xml +++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_1.xml @@ -1,4 +1,3 @@ - 1 diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_50.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_50.xml index f3b8c6a03b4..33ed0030acf 100644 --- a/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_50.xml +++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_50.xml @@ -1,4 +1,3 @@ - 50 diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_limit_reached.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_limit_reached.xml index 77303cb0c35..d32417ca6e3 100644 --- a/tests/integration/test_concurrent_threads_soft_limit/configs/config_limit_reached.xml +++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_limit_reached.xml @@ -1,4 +1,3 @@ - 10 diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/users.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/users.xml index 63fefbb803b..704c9220554 100644 --- a/tests/integration/test_concurrent_threads_soft_limit/configs/users.xml +++ b/tests/integration/test_concurrent_threads_soft_limit/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_corresponding_root/configs/config.xml b/tests/integration/test_config_corresponding_root/configs/config.xml index 914d4e6cb0e..72014646161 100644 --- a/tests/integration/test_config_corresponding_root/configs/config.xml +++ b/tests/integration/test_config_corresponding_root/configs/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_corresponding_root/configs/users.xml b/tests/integration/test_config_corresponding_root/configs/users.xml index bffce084828..9d8e6e02acc 100644 --- a/tests/integration/test_config_corresponding_root/configs/users.xml +++ b/tests/integration/test_config_corresponding_root/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml index 690d62b9a2b..b26c0b01888 100644 --- a/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml +++ b/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml index 55e84568af1..4e3d1def5fc 100644 --- a/tests/integration/test_config_xml_full/configs/config.xml +++ b/tests/integration/test_config_xml_full/configs/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml index cfde1b4525d..ec3057c82d7 100644 --- a/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml +++ b/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_full/configs/users.xml b/tests/integration/test_config_xml_full/configs/users.xml index 378e4e4c570..ee07ea863c5 100644 --- a/tests/integration/test_config_xml_full/configs/users.xml +++ b/tests/integration/test_config_xml_full/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_main/configs/config.xml b/tests/integration/test_config_xml_main/configs/config.xml index 515575a1798..cd178668bda 100644 --- a/tests/integration/test_config_xml_main/configs/config.xml +++ b/tests/integration/test_config_xml_main/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_config_xml_main/configs/embedded.xml b/tests/integration/test_config_xml_main/configs/embedded.xml index 2b6c4d9f770..c9d269a5355 100644 --- a/tests/integration/test_config_xml_main/configs/embedded.xml +++ b/tests/integration/test_config_xml_main/configs/embedded.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_main/configs/users.xml b/tests/integration/test_config_xml_main/configs/users.xml index ac785c12577..6f94d1696e3 100644 --- a/tests/integration/test_config_xml_main/configs/users.xml +++ b/tests/integration/test_config_xml_main/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml index 690d62b9a2b..b26c0b01888 100644 --- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml +++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.xml index 870379618f2..dc1cb85e155 100644 --- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml +++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml index 2b6c4d9f770..c9d269a5355 100644 --- a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml +++ b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml index cfde1b4525d..ec3057c82d7 100644 --- a/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml +++ b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_yaml_full/configs/embedded.xml b/tests/integration/test_config_yaml_full/configs/embedded.xml index 2b6c4d9f770..c9d269a5355 100644 --- a/tests/integration/test_config_yaml_full/configs/embedded.xml +++ b/tests/integration/test_config_yaml_full/configs/embedded.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml index 690d62b9a2b..b26c0b01888 100644 --- a/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml +++ b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_yaml_main/configs/embedded.xml b/tests/integration/test_config_yaml_main/configs/embedded.xml index 2b6c4d9f770..c9d269a5355 100644 --- a/tests/integration/test_config_yaml_main/configs/embedded.xml +++ b/tests/integration/test_config_yaml_main/configs/embedded.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml index cfde1b4525d..ec3057c82d7 100644 --- a/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml +++ b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_create_user_and_login/test.py b/tests/integration/test_create_user_and_login/test.py index 25346c22d3b..1b59089fa11 100644 --- a/tests/integration/test_create_user_and_login/test.py +++ b/tests/integration/test_create_user_and_login/test.py @@ -61,7 +61,6 @@ def test_login_as_dropped_user_xml(): "-c", """ cat > /etc/clickhouse-server/users.d/user_c.xml << EOF - diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml index 4bd62c34536..13cf3d0d1bd 100644 --- a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml +++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml index 8bfe1fff690..d2a014f5bc1 100644 --- a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml +++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml +++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml b/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml index 835814671e7..cb6f0e228c5 100644 --- a/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml +++ b/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml b/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml +++ b/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_ddl/configs/user_admin.xml b/tests/integration/test_dictionaries_ddl/configs/user_admin.xml index abbca144c35..b5e94aed63a 100644 --- a/tests/integration/test_dictionaries_ddl/configs/user_admin.xml +++ b/tests/integration/test_dictionaries_ddl/configs/user_admin.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_ddl/configs/user_default.xml b/tests/integration/test_dictionaries_ddl/configs/user_default.xml index 9b01205192b..bf004102329 100644 --- a/tests/integration/test_dictionaries_ddl/configs/user_default.xml +++ b/tests/integration/test_dictionaries_ddl/configs/user_default.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_dependency_xml/configs/config.xml b/tests/integration/test_dictionaries_dependency_xml/configs/config.xml index 7ed6d759dac..099515eeccc 100644 --- a/tests/integration/test_dictionaries_dependency_xml/configs/config.xml +++ b/tests/integration/test_dictionaries_dependency_xml/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_dependency_xml/configs/users.xml b/tests/integration/test_dictionaries_dependency_xml/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_dependency_xml/configs/users.xml +++ b/tests/integration/test_dictionaries_dependency_xml/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_mysql/configs/config.xml b/tests/integration/test_dictionaries_mysql/configs/config.xml index 7ed6d759dac..099515eeccc 100644 --- a/tests/integration/test_dictionaries_mysql/configs/config.xml +++ b/tests/integration/test_dictionaries_mysql/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml index 9e149ca8575..d4d2466b7bf 100644 --- a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml +++ b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml @@ -1,4 +1,3 @@ - dict0 diff --git a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml index 7587936ae99..031afbba636 100644 --- a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml +++ b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml @@ -1,4 +1,3 @@ - dict2 diff --git a/tests/integration/test_dictionaries_mysql/configs/users.xml b/tests/integration/test_dictionaries_mysql/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_mysql/configs/users.xml +++ b/tests/integration/test_dictionaries_mysql/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_null_value/configs/config.xml b/tests/integration/test_dictionaries_null_value/configs/config.xml index 95c52a19611..3d5fca55918 100644 --- a/tests/integration/test_dictionaries_null_value/configs/config.xml +++ b/tests/integration/test_dictionaries_null_value/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_null_value/configs/users.xml b/tests/integration/test_dictionaries_null_value/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_null_value/configs/users.xml +++ b/tests/integration/test_dictionaries_null_value/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_postgresql/configs/config.xml b/tests/integration/test_dictionaries_postgresql/configs/config.xml index 48c9dff364a..a897b5bb60e 100644 --- a/tests/integration/test_dictionaries_postgresql/configs/config.xml +++ b/tests/integration/test_dictionaries_postgresql/configs/config.xml @@ -1,4 +1,3 @@ - /etc/clickhouse-server/config.d/postgres_dict.xml diff --git a/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml b/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml index dc4e474f125..66a5386793f 100644 --- a/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml +++ b/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml @@ -1,4 +1,3 @@ - dict0 diff --git a/tests/integration/test_dictionaries_select_all/configs/config.xml b/tests/integration/test_dictionaries_select_all/configs/config.xml index 95c52a19611..3d5fca55918 100644 --- a/tests/integration/test_dictionaries_select_all/configs/config.xml +++ b/tests/integration/test_dictionaries_select_all/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_select_all/configs/users.xml b/tests/integration/test_dictionaries_select_all/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_select_all/configs/users.xml +++ b/tests/integration/test_dictionaries_select_all/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/config.xml b/tests/integration/test_dictionaries_update_and_reload/configs/config.xml index d7d0c7a0c89..fbd44095364 100644 --- a/tests/integration/test_dictionaries_update_and_reload/configs/config.xml +++ b/tests/integration/test_dictionaries_update_and_reload/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml index c34107e30d9..be056cd4f14 100644 --- a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml +++ b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml @@ -1,4 +1,3 @@ - executable diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml index 1679801aed0..74d9135e521 100644 --- a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml +++ b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml @@ -1,4 +1,3 @@ - file diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml index 16b00ecd76a..7c30ba76da0 100644 --- a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml +++ b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml @@ -1,4 +1,3 @@ - slow diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/users.xml b/tests/integration/test_dictionaries_update_and_reload/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_update_and_reload/configs/users.xml +++ b/tests/integration/test_dictionaries_update_and_reload/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionaries_update_field/configs/config.xml b/tests/integration/test_dictionaries_update_field/configs/config.xml index 835814671e7..cb6f0e228c5 100644 --- a/tests/integration/test_dictionaries_update_field/configs/config.xml +++ b/tests/integration/test_dictionaries_update_field/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionaries_update_field/configs/users.xml b/tests/integration/test_dictionaries_update_field/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionaries_update_field/configs/users.xml +++ b/tests/integration/test_dictionaries_update_field/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml b/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml index 835814671e7..cb6f0e228c5 100644 --- a/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml +++ b/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml b/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml +++ b/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dictionary_custom_settings/configs/config.xml b/tests/integration/test_dictionary_custom_settings/configs/config.xml index 95c52a19611..3d5fca55918 100644 --- a/tests/integration/test_dictionary_custom_settings/configs/config.xml +++ b/tests/integration/test_dictionary_custom_settings/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_dictionary_custom_settings/configs/users.xml b/tests/integration/test_dictionary_custom_settings/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_dictionary_custom_settings/configs/users.xml +++ b/tests/integration/test_dictionary_custom_settings/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disabled_access_control_improvements/all_rows.xml b/tests/integration/test_disabled_access_control_improvements/all_rows.xml index 948aed1a874..bbeccc1c51a 100644 --- a/tests/integration/test_disabled_access_control_improvements/all_rows.xml +++ b/tests/integration/test_disabled_access_control_improvements/all_rows.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disabled_access_control_improvements/configs/users.d/another_user.xml b/tests/integration/test_disabled_access_control_improvements/configs/users.d/another_user.xml index 476072bd138..d1d47ba2ec8 100644 --- a/tests/integration/test_disabled_access_control_improvements/configs/users.d/another_user.xml +++ b/tests/integration/test_disabled_access_control_improvements/configs/users.d/another_user.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disabled_access_control_improvements/configs/users.xml b/tests/integration/test_disabled_access_control_improvements/configs/users.xml index 5dc65384a2d..a4b5c2f8daf 100644 --- a/tests/integration/test_disabled_access_control_improvements/configs/users.xml +++ b/tests/integration/test_disabled_access_control_improvements/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disabled_access_control_improvements/no_filters.xml b/tests/integration/test_disabled_access_control_improvements/no_filters.xml index fddc67fc3f9..3cbf717bb67 100644 --- a/tests/integration/test_disabled_access_control_improvements/no_filters.xml +++ b/tests/integration/test_disabled_access_control_improvements/no_filters.xml @@ -1,3 +1,2 @@ - diff --git a/tests/integration/test_disabled_access_control_improvements/no_rows.xml b/tests/integration/test_disabled_access_control_improvements/no_rows.xml index 760203210b2..b7e179bc5c0 100644 --- a/tests/integration/test_disabled_access_control_improvements/no_rows.xml +++ b/tests/integration/test_disabled_access_control_improvements/no_rows.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disabled_access_control_improvements/normal_filters.xml b/tests/integration/test_disabled_access_control_improvements/normal_filters.xml index 6f5cd8701f6..ab4e08eb308 100644 --- a/tests/integration/test_disabled_access_control_improvements/normal_filters.xml +++ b/tests/integration/test_disabled_access_control_improvements/normal_filters.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf.xml index 7e5c22c6e4d..ca81daf015e 100644 --- a/tests/integration/test_disk_over_web_server/configs/storage_conf.xml +++ b/tests/integration/test_disk_over_web_server/configs/storage_conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml index e69794638f1..56ee3e532c4 100644 --- a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml +++ b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disk_types/configs/config.xml b/tests/integration/test_disk_types/configs/config.xml index 699e8834701..7047dca698f 100644 --- a/tests/integration/test_disk_types/configs/config.xml +++ b/tests/integration/test_disk_types/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_disk_types/configs/storage.xml b/tests/integration/test_disk_types/configs/storage.xml index 78e7fb01553..c55d589d19e 100644 --- a/tests/integration/test_disk_types/configs/storage.xml +++ b/tests/integration/test_disk_types/configs/storage.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disk_types/configs/users.xml b/tests/integration/test_disk_types/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_disk_types/configs/users.xml +++ b/tests/integration/test_disk_types/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_disks_app_func/config.xml b/tests/integration/test_disks_app_func/config.xml index b3c96e3c0ca..779232b3341 100644 --- a/tests/integration/test_disks_app_func/config.xml +++ b/tests/integration/test_disks_app_func/config.xml @@ -1,4 +1,3 @@ - /var/lib/clickhouse/ diff --git a/tests/integration/test_distributed_ddl_parallel/configs/dict.xml b/tests/integration/test_distributed_ddl_parallel/configs/dict.xml index 580d95c6e5e..6335f171480 100644 --- a/tests/integration/test_distributed_ddl_parallel/configs/dict.xml +++ b/tests/integration/test_distributed_ddl_parallel/configs/dict.xml @@ -1,4 +1,3 @@ - slow_dict_7 diff --git a/tests/integration/test_distributed_default_database/configs/users.xml b/tests/integration/test_distributed_default_database/configs/users.xml index a49b1363433..e7fe138fbeb 100644 --- a/tests/integration/test_distributed_default_database/configs/users.xml +++ b/tests/integration/test_distributed_default_database/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_distributed_inter_server_secret/configs/users.xml b/tests/integration/test_distributed_inter_server_secret/configs/users.xml index d73fbc2183b..31ad3c3a4c5 100644 --- a/tests/integration/test_distributed_inter_server_secret/configs/users.xml +++ b/tests/integration/test_distributed_inter_server_secret/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_distributed_load_balancing/configs/users.xml b/tests/integration/test_distributed_load_balancing/configs/users.xml index f4c52d0f211..dfa6bf9e652 100644 --- a/tests/integration/test_distributed_load_balancing/configs/users.xml +++ b/tests/integration/test_distributed_load_balancing/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dotnet_client/configs/config.xml b/tests/integration/test_dotnet_client/configs/config.xml index fe64e47d384..7f77f14f376 100644 --- a/tests/integration/test_dotnet_client/configs/config.xml +++ b/tests/integration/test_dotnet_client/configs/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_dotnet_client/configs/users.xml b/tests/integration/test_dotnet_client/configs/users.xml index 1874371871a..7682741488a 100644 --- a/tests/integration/test_dotnet_client/configs/users.xml +++ b/tests/integration/test_dotnet_client/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_encrypted_disk/configs/storage.xml b/tests/integration/test_encrypted_disk/configs/storage.xml index 212c1616d6e..41a29455fe5 100644 --- a/tests/integration/test_encrypted_disk/configs/storage.xml +++ b/tests/integration/test_encrypted_disk/configs/storage.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_encrypted_disk/test.py b/tests/integration/test_encrypted_disk/test.py index 17a30676f7f..42ce7aab906 100644 --- a/tests/integration/test_encrypted_disk/test.py +++ b/tests/integration/test_encrypted_disk/test.py @@ -166,7 +166,6 @@ def test_add_key(): "bash", "-c", """cat > /etc/clickhouse-server/config.d/storage_policy_{policy_name}.xml << EOF - diff --git a/tests/integration/test_file_schema_inference_cache/configs/config.d/query_log.xml b/tests/integration/test_file_schema_inference_cache/configs/config.d/query_log.xml index de7e27921f0..69060e5abf9 100644 --- a/tests/integration/test_file_schema_inference_cache/configs/config.d/query_log.xml +++ b/tests/integration/test_file_schema_inference_cache/configs/config.d/query_log.xml @@ -1,4 +1,3 @@ - system diff --git a/tests/integration/test_file_schema_inference_cache/configs/config.d/schema_cache.xml b/tests/integration/test_file_schema_inference_cache/configs/config.d/schema_cache.xml index de3c4cbe57f..7587fb433eb 100644 --- a/tests/integration/test_file_schema_inference_cache/configs/config.d/schema_cache.xml +++ b/tests/integration/test_file_schema_inference_cache/configs/config.d/schema_cache.xml @@ -1,4 +1,3 @@ - 2 diff --git a/tests/integration/test_graphite_merge_tree/configs/users.xml b/tests/integration/test_graphite_merge_tree/configs/users.xml index 66d0cd7e445..f2e2fd93c0b 100644 --- a/tests/integration/test_graphite_merge_tree/configs/users.xml +++ b/tests/integration/test_graphite_merge_tree/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_graphite_merge_tree_typed/configs/users.xml b/tests/integration/test_graphite_merge_tree_typed/configs/users.xml index 66d0cd7e445..f2e2fd93c0b 100644 --- a/tests/integration/test_graphite_merge_tree_typed/configs/users.xml +++ b/tests/integration/test_graphite_merge_tree_typed/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_hedged_requests/configs/users.xml b/tests/integration/test_hedged_requests/configs/users.xml index fa3fc4d0fd5..184b7857245 100644 --- a/tests/integration/test_hedged_requests/configs/users.xml +++ b/tests/integration/test_hedged_requests/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_hedged_requests/configs/users1.xml b/tests/integration/test_hedged_requests/configs/users1.xml index 3547177eb80..db0dd71de56 100644 --- a/tests/integration/test_hedged_requests/configs/users1.xml +++ b/tests/integration/test_hedged_requests/configs/users1.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_hedged_requests_parallel/configs/users.xml b/tests/integration/test_hedged_requests_parallel/configs/users.xml index d2351c184b2..6fb96f1689c 100644 --- a/tests/integration/test_hedged_requests_parallel/configs/users.xml +++ b/tests/integration/test_hedged_requests_parallel/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_hedged_requests_parallel/configs/users1.xml b/tests/integration/test_hedged_requests_parallel/configs/users1.xml index 3547177eb80..db0dd71de56 100644 --- a/tests/integration/test_hedged_requests_parallel/configs/users1.xml +++ b/tests/integration/test_hedged_requests_parallel/configs/users1.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml b/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml index ae2e5562ff7..a7d35d07a32 100644 --- a/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml +++ b/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml @@ -1,4 +1,3 @@ - Default server response diff --git a/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml b/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml index 68e5ba302db..c9b61c21507 100644 --- a/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml +++ b/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml b/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml index 96fc018ae3e..5b5de63356e 100644 --- a/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml +++ b/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml b/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml index 3402d9ebf96..a7c92427c5c 100644 --- a/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml +++ b/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml b/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml index fdfeb981ee3..d762bfe289e 100644 --- a/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml +++ b/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_http_handlers_config/test_static_handler/config.xml b/tests/integration/test_http_handlers_config/test_static_handler/config.xml index 48cbdb6c682..ff24e6dec96 100644 --- a/tests/integration/test_http_handlers_config/test_static_handler/config.xml +++ b/tests/integration/test_http_handlers_config/test_static_handler/config.xml @@ -1,4 +1,3 @@ - Test get static handler and config content diff --git a/tests/integration/test_https_replication/configs/config.xml b/tests/integration/test_https_replication/configs/config.xml index c1fc5d29c22..675efee8ea6 100644 --- a/tests/integration/test_https_replication/configs/config.xml +++ b/tests/integration/test_https_replication/configs/config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml b/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml index 2cc29c0c76d..ff3e28cdb5d 100644 --- a/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml +++ b/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml @@ -1,4 +1,3 @@ - bridge1 diff --git a/tests/integration/test_join_set_family_s3/configs/config.xml b/tests/integration/test_join_set_family_s3/configs/config.xml index 87270096ccd..d4a2a9cf367 100644 --- a/tests/integration/test_join_set_family_s3/configs/config.xml +++ b/tests/integration/test_join_set_family_s3/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_join_set_family_s3/configs/minio.xml b/tests/integration/test_join_set_family_s3/configs/minio.xml index 8a3222c37a3..d5952a6848f 100644 --- a/tests/integration/test_join_set_family_s3/configs/minio.xml +++ b/tests/integration/test_join_set_family_s3/configs/minio.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_join_set_family_s3/configs/ssl.xml b/tests/integration/test_join_set_family_s3/configs/ssl.xml index 1200dc8c94b..d4cea955c68 100644 --- a/tests/integration/test_join_set_family_s3/configs/ssl.xml +++ b/tests/integration/test_join_set_family_s3/configs/ssl.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_join_set_family_s3/configs/users.xml b/tests/integration/test_join_set_family_s3/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_join_set_family_s3/configs/users.xml +++ b/tests/integration/test_join_set_family_s3/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml index df0fe2ddf05..b1aca0f0aac 100644 --- a/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml +++ b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml @@ -1,4 +1,3 @@ - dict1 diff --git a/tests/integration/test_log_family_hdfs/configs/storage_conf.xml b/tests/integration/test_log_family_hdfs/configs/storage_conf.xml index ffa5d516ae0..82cea6730ff 100644 --- a/tests/integration/test_log_family_hdfs/configs/storage_conf.xml +++ b/tests/integration/test_log_family_hdfs/configs/storage_conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_log_family_s3/configs/config.xml b/tests/integration/test_log_family_s3/configs/config.xml index 87270096ccd..d4a2a9cf367 100644 --- a/tests/integration/test_log_family_s3/configs/config.xml +++ b/tests/integration/test_log_family_s3/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_log_family_s3/configs/minio.xml b/tests/integration/test_log_family_s3/configs/minio.xml index 8a3222c37a3..d5952a6848f 100644 --- a/tests/integration/test_log_family_s3/configs/minio.xml +++ b/tests/integration/test_log_family_s3/configs/minio.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_log_family_s3/configs/ssl.xml b/tests/integration/test_log_family_s3/configs/ssl.xml index 1200dc8c94b..d4cea955c68 100644 --- a/tests/integration/test_log_family_s3/configs/ssl.xml +++ b/tests/integration/test_log_family_s3/configs/ssl.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_log_family_s3/configs/users.xml b/tests/integration/test_log_family_s3/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_log_family_s3/configs/users.xml +++ b/tests/integration/test_log_family_s3/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_logs_level/configs/config_information.xml b/tests/integration/test_logs_level/configs/config_information.xml index 17342b36c57..518657e82ca 100644 --- a/tests/integration/test_logs_level/configs/config_information.xml +++ b/tests/integration/test_logs_level/configs/config_information.xml @@ -1,4 +1,3 @@ - information diff --git a/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml b/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml index 58087e93882..70a8a066661 100644 --- a/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml +++ b/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml @@ -1,4 +1,3 @@ - /var/log/clickhouse-server/log.log diff --git a/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml b/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml index 3547177eb80..db0dd71de56 100644 --- a/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml +++ b/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_materialized_mysql_database/configs/users.xml b/tests/integration/test_materialized_mysql_database/configs/users.xml index 0e116f115fe..3669fbb46ba 100644 --- a/tests/integration/test_materialized_mysql_database/configs/users.xml +++ b/tests/integration/test_materialized_mysql_database/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml b/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml index a00b6ca6b9a..f0aa2ecfa49 100644 --- a/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml +++ b/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml b/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml index 3a7cc2537e5..857a0035b3c 100644 --- a/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml +++ b/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_merge_tree_azure_blob_storage/configs/config.xml b/tests/integration/test_merge_tree_azure_blob_storage/configs/config.xml index 8e7eada42ed..feb537ebbce 100644 --- a/tests/integration/test_merge_tree_azure_blob_storage/configs/config.xml +++ b/tests/integration/test_merge_tree_azure_blob_storage/configs/config.xml @@ -1,4 +1,3 @@ - 9000 127.0.0.1 diff --git a/tests/integration/test_merge_tree_s3/configs/config.xml b/tests/integration/test_merge_tree_s3/configs/config.xml index 8e7eada42ed..feb537ebbce 100644 --- a/tests/integration/test_merge_tree_s3/configs/config.xml +++ b/tests/integration/test_merge_tree_s3/configs/config.xml @@ -1,4 +1,3 @@ - 9000 127.0.0.1 diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml index 7140b923e53..17622e0faff 100644 --- a/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml +++ b/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml @@ -1,4 +1,3 @@ - system diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.xml index 8e7eada42ed..feb537ebbce 100644 --- a/tests/integration/test_merge_tree_s3_failover/configs/config.xml +++ b/tests/integration/test_merge_tree_s3_failover/configs/config.xml @@ -1,4 +1,3 @@ - 9000 127.0.0.1 diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml index dd383c14116..d02d5ab0bf5 100644 --- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml +++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.xml index 8e7eada42ed..feb537ebbce 100644 --- a/tests/integration/test_merge_tree_s3_restore/configs/config.xml +++ b/tests/integration/test_merge_tree_s3_restore/configs/config.xml @@ -1,4 +1,3 @@ - 9000 127.0.0.1 diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml index 33da9cd1586..24d66fc674e 100644 --- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml +++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml @@ -1,4 +1,3 @@ - system diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml index 1200dc8c94b..d4cea955c68 100644 --- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml +++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml index ccba76b71a6..efc501ad901 100644 --- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml +++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml @@ -1,4 +1,3 @@ - 9000 127.0.0.1 diff --git a/tests/integration/test_mutations_with_merge_tree/configs/config.xml b/tests/integration/test_mutations_with_merge_tree/configs/config.xml index 9183a737238..721fc429204 100644 --- a/tests/integration/test_mutations_with_merge_tree/configs/config.xml +++ b/tests/integration/test_mutations_with_merge_tree/configs/config.xml @@ -1,4 +1,3 @@ - /var/log/clickhouse-server/log.log diff --git a/tests/integration/test_mutations_with_merge_tree/configs/users.xml b/tests/integration/test_mutations_with_merge_tree/configs/users.xml index 7b28d23746c..d1a3ae1e859 100644 --- a/tests/integration/test_mutations_with_merge_tree/configs/users.xml +++ b/tests/integration/test_mutations_with_merge_tree/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_mutations_with_projection/configs/config.xml b/tests/integration/test_mutations_with_projection/configs/config.xml index 9183a737238..721fc429204 100644 --- a/tests/integration/test_mutations_with_projection/configs/config.xml +++ b/tests/integration/test_mutations_with_projection/configs/config.xml @@ -1,4 +1,3 @@ - /var/log/clickhouse-server/log.log diff --git a/tests/integration/test_mutations_with_projection/configs/users.xml b/tests/integration/test_mutations_with_projection/configs/users.xml index 37e6c66b5a5..135252f714c 100644 --- a/tests/integration/test_mutations_with_projection/configs/users.xml +++ b/tests/integration/test_mutations_with_projection/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_mysql_protocol/configs/config.xml b/tests/integration/test_mysql_protocol/configs/config.xml index a2ba348eabd..d865d5f11cf 100644 --- a/tests/integration/test_mysql_protocol/configs/config.xml +++ b/tests/integration/test_mysql_protocol/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_mysql_protocol/configs/mysql.xml b/tests/integration/test_mysql_protocol/configs/mysql.xml index 35731682db2..768e6e2e641 100644 --- a/tests/integration/test_mysql_protocol/configs/mysql.xml +++ b/tests/integration/test_mysql_protocol/configs/mysql.xml @@ -1,4 +1,3 @@ - 9001 diff --git a/tests/integration/test_mysql_protocol/configs/ssl_conf.xml b/tests/integration/test_mysql_protocol/configs/ssl_conf.xml index 43b25032059..67f1b64bb85 100644 --- a/tests/integration/test_mysql_protocol/configs/ssl_conf.xml +++ b/tests/integration/test_mysql_protocol/configs/ssl_conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_mysql_protocol/configs/users.xml b/tests/integration/test_mysql_protocol/configs/users.xml index 9f82953225f..a5f8232450b 100644 --- a/tests/integration/test_mysql_protocol/configs/users.xml +++ b/tests/integration/test_mysql_protocol/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_odbc_interaction/configs/config.xml b/tests/integration/test_odbc_interaction/configs/config.xml index 861c81248d7..abe0a05b65c 100644 --- a/tests/integration/test_odbc_interaction/configs/config.xml +++ b/tests/integration/test_odbc_interaction/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_odbc_interaction/configs/odbc_logging.xml b/tests/integration/test_odbc_interaction/configs/odbc_logging.xml index ad013cbcdac..d14b4b8f96d 100644 --- a/tests/integration/test_odbc_interaction/configs/odbc_logging.xml +++ b/tests/integration/test_odbc_interaction/configs/odbc_logging.xml @@ -1,4 +1,3 @@ - /var/log/clickhouse-server/clickhouse-odbc-bridge.log diff --git a/tests/integration/test_odbc_interaction/configs/openssl.xml b/tests/integration/test_odbc_interaction/configs/openssl.xml index 1200dc8c94b..d4cea955c68 100644 --- a/tests/integration/test_odbc_interaction/configs/openssl.xml +++ b/tests/integration/test_odbc_interaction/configs/openssl.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_odbc_interaction/configs/users.xml b/tests/integration/test_odbc_interaction/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_odbc_interaction/configs/users.xml +++ b/tests/integration/test_odbc_interaction/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_postgresql_protocol/configs/config.xml b/tests/integration/test_postgresql_protocol/configs/config.xml index b3340627751..9a20dfd45e6 100644 --- a/tests/integration/test_postgresql_protocol/configs/config.xml +++ b/tests/integration/test_postgresql_protocol/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_postgresql_protocol/configs/default_passwd.xml b/tests/integration/test_postgresql_protocol/configs/default_passwd.xml index ad56fbfa635..123a9be0c81 100644 --- a/tests/integration/test_postgresql_protocol/configs/default_passwd.xml +++ b/tests/integration/test_postgresql_protocol/configs/default_passwd.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_postgresql_protocol/configs/log.xml b/tests/integration/test_postgresql_protocol/configs/log.xml index 21cd83a1af2..22f95a8bd5d 100644 --- a/tests/integration/test_postgresql_protocol/configs/log.xml +++ b/tests/integration/test_postgresql_protocol/configs/log.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_postgresql_protocol/configs/postresql.xml b/tests/integration/test_postgresql_protocol/configs/postresql.xml index 52f8ce9fb89..e8bc3eadf5e 100644 --- a/tests/integration/test_postgresql_protocol/configs/postresql.xml +++ b/tests/integration/test_postgresql_protocol/configs/postresql.xml @@ -1,4 +1,3 @@ - 5433 diff --git a/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml b/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml index 46a69601de9..778d327c460 100644 --- a/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml +++ b/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_postgresql_protocol/configs/users.xml b/tests/integration/test_postgresql_protocol/configs/users.xml index ad56fbfa635..123a9be0c81 100644 --- a/tests/integration/test_postgresql_protocol/configs/users.xml +++ b/tests/integration/test_postgresql_protocol/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_postgresql_replica_database_engine_1/configs/users.xml b/tests/integration/test_postgresql_replica_database_engine_1/configs/users.xml index 588ebd116c7..26ea20e012f 100644 --- a/tests/integration/test_postgresql_replica_database_engine_1/configs/users.xml +++ b/tests/integration/test_postgresql_replica_database_engine_1/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_postgresql_replica_database_engine_2/configs/users.xml b/tests/integration/test_postgresql_replica_database_engine_2/configs/users.xml index 588ebd116c7..26ea20e012f 100644 --- a/tests/integration/test_postgresql_replica_database_engine_2/configs/users.xml +++ b/tests/integration/test_postgresql_replica_database_engine_2/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_profile_events_s3/configs/config.xml b/tests/integration/test_profile_events_s3/configs/config.xml index 226e3e7efbe..f00ba1b32fb 100644 --- a/tests/integration/test_profile_events_s3/configs/config.xml +++ b/tests/integration/test_profile_events_s3/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_profile_events_s3/configs/log.xml b/tests/integration/test_profile_events_s3/configs/log.xml index c58040559d8..049fa471846 100644 --- a/tests/integration/test_profile_events_s3/configs/log.xml +++ b/tests/integration/test_profile_events_s3/configs/log.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_profile_events_s3/configs/query_log.xml b/tests/integration/test_profile_events_s3/configs/query_log.xml index 33da9cd1586..24d66fc674e 100644 --- a/tests/integration/test_profile_events_s3/configs/query_log.xml +++ b/tests/integration/test_profile_events_s3/configs/query_log.xml @@ -1,4 +1,3 @@ - system diff --git a/tests/integration/test_profile_events_s3/configs/ssl_conf.xml b/tests/integration/test_profile_events_s3/configs/ssl_conf.xml index 1200dc8c94b..d4cea955c68 100644 --- a/tests/integration/test_profile_events_s3/configs/ssl_conf.xml +++ b/tests/integration/test_profile_events_s3/configs/ssl_conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_profile_events_s3/configs/users.xml b/tests/integration/test_profile_events_s3/configs/users.xml index 4b08a2dc4a4..b7c75cf619e 100644 --- a/tests/integration/test_profile_events_s3/configs/users.xml +++ b/tests/integration/test_profile_events_s3/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_quorum_inserts/configs/users.d/settings.xml b/tests/integration/test_quorum_inserts/configs/users.d/settings.xml index 234e90689dc..3ed2607b45b 100644 --- a/tests/integration/test_quorum_inserts/configs/users.d/settings.xml +++ b/tests/integration/test_quorum_inserts/configs/users.d/settings.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_quota/no_quotas.xml b/tests/integration/test_quota/no_quotas.xml index fddc67fc3f9..3cbf717bb67 100644 --- a/tests/integration/test_quota/no_quotas.xml +++ b/tests/integration/test_quota/no_quotas.xml @@ -1,3 +1,2 @@ - diff --git a/tests/integration/test_quota/normal_limits.xml b/tests/integration/test_quota/normal_limits.xml index b91320d57ba..6061104ec9f 100644 --- a/tests/integration/test_quota/normal_limits.xml +++ b/tests/integration/test_quota/normal_limits.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_quota/simpliest.xml b/tests/integration/test_quota/simpliest.xml index 2095457eba2..c89f6ec6890 100644 --- a/tests/integration/test_quota/simpliest.xml +++ b/tests/integration/test_quota/simpliest.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_quota/tiny_limits.xml b/tests/integration/test_quota/tiny_limits.xml index 2dd50eba5b7..5821935bb6d 100644 --- a/tests/integration/test_quota/tiny_limits.xml +++ b/tests/integration/test_quota/tiny_limits.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_quota/tracking.xml b/tests/integration/test_quota/tracking.xml index f0fc55f5589..3111b7e6cbc 100644 --- a/tests/integration/test_quota/tracking.xml +++ b/tests/integration/test_quota/tracking.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_quota/two_intervals.xml b/tests/integration/test_quota/two_intervals.xml index 8362413f4d8..a192b46ea71 100644 --- a/tests/integration/test_quota/two_intervals.xml +++ b/tests/integration/test_quota/two_intervals.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_quota/two_quotas.xml b/tests/integration/test_quota/two_quotas.xml index 1da0f5831b7..13872286dc6 100644 --- a/tests/integration/test_quota/two_quotas.xml +++ b/tests/integration/test_quota/two_quotas.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_relative_filepath/configs/config.xml b/tests/integration/test_relative_filepath/configs/config.xml index 19fb49fed3f..33b0515c35d 100644 --- a/tests/integration/test_relative_filepath/configs/config.xml +++ b/tests/integration/test_relative_filepath/configs/config.xml @@ -1,4 +1,3 @@ - user_files diff --git a/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml b/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml index d1c2e5958c8..66585859e71 100644 --- a/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml +++ b/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml b/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml +++ b/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_reload_certificate/configs/cert.xml b/tests/integration/test_reload_certificate/configs/cert.xml index 91fe8156d1e..03387757258 100644 --- a/tests/integration/test_reload_certificate/configs/cert.xml +++ b/tests/integration/test_reload_certificate/configs/cert.xml @@ -1,4 +1,3 @@ - 8443 diff --git a/tests/integration/test_reload_certificate/test.py b/tests/integration/test_reload_certificate/test.py index a9012b9defd..1718e440629 100644 --- a/tests/integration/test_reload_certificate/test.py +++ b/tests/integration/test_reload_certificate/test.py @@ -46,7 +46,6 @@ def change_config_to_key(name, pass_phrase=""): "bash", "-c", """cat > /etc/clickhouse-server/config.d/cert.xml << EOF - 8443 diff --git a/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml b/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml index d1c2e5958c8..66585859e71 100644 --- a/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml +++ b/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml b/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml index 34849e1187a..0500e2ad554 100644 --- a/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml +++ b/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml @@ -1,4 +1,3 @@ - 1 1 diff --git a/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml b/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml +++ b/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_reload_zookeeper/configs/config.xml b/tests/integration/test_reload_zookeeper/configs/config.xml index d1c2e5958c8..66585859e71 100644 --- a/tests/integration/test_reload_zookeeper/configs/config.xml +++ b/tests/integration/test_reload_zookeeper/configs/config.xml @@ -1,4 +1,3 @@ - trace diff --git a/tests/integration/test_reload_zookeeper/configs/users.xml b/tests/integration/test_reload_zookeeper/configs/users.xml index 7c18d7144a3..4555a2ed494 100644 --- a/tests/integration/test_reload_zookeeper/configs/users.xml +++ b/tests/integration/test_reload_zookeeper/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml index 9692bebf0eb..6b1611079ec 100644 --- a/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml +++ b/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml index 0b82d51bdaf..c02c5161683 100644 --- a/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml +++ b/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml index 6c80c344af5..e4c3d4b1bf5 100644 --- a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml +++ b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml index 77947f5eb95..4dee699da52 100644 --- a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml +++ b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml index 97190ad1e04..0aa0c1828e2 100644 --- a/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml +++ b/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml b/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml index c979d76b50c..b18f0fbc93f 100644 --- a/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml +++ b/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_replicated_merge_tree_config/configs/config.xml b/tests/integration/test_replicated_merge_tree_config/configs/config.xml index ca8edc41ab6..82e716919bc 100644 --- a/tests/integration/test_replicated_merge_tree_config/configs/config.xml +++ b/tests/integration/test_replicated_merge_tree_config/configs/config.xml @@ -1,4 +1,3 @@ - 100 diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml index 31f7e06db3c..e0b94f46d83 100644 --- a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml +++ b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/all_rows.xml b/tests/integration/test_row_policy/all_rows.xml index 948aed1a874..bbeccc1c51a 100644 --- a/tests/integration/test_row_policy/all_rows.xml +++ b/tests/integration/test_row_policy/all_rows.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/configs/users.d/another_user.xml b/tests/integration/test_row_policy/configs/users.d/another_user.xml index 19249011968..5007153fa4a 100644 --- a/tests/integration/test_row_policy/configs/users.d/another_user.xml +++ b/tests/integration/test_row_policy/configs/users.d/another_user.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml b/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml index b93613cba09..32ab078b231 100644 --- a/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml +++ b/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/configs/users.xml b/tests/integration/test_row_policy/configs/users.xml index a583770d1f0..9cb6c5bb93b 100644 --- a/tests/integration/test_row_policy/configs/users.xml +++ b/tests/integration/test_row_policy/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/no_filters.xml b/tests/integration/test_row_policy/no_filters.xml index fddc67fc3f9..3cbf717bb67 100644 --- a/tests/integration/test_row_policy/no_filters.xml +++ b/tests/integration/test_row_policy/no_filters.xml @@ -1,3 +1,2 @@ - diff --git a/tests/integration/test_row_policy/no_rows.xml b/tests/integration/test_row_policy/no_rows.xml index 760203210b2..b7e179bc5c0 100644 --- a/tests/integration/test_row_policy/no_rows.xml +++ b/tests/integration/test_row_policy/no_rows.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/normal_filter2_table2.xml b/tests/integration/test_row_policy/normal_filter2_table2.xml index 3eac0403411..03ed68ea7a3 100644 --- a/tests/integration/test_row_policy/normal_filter2_table2.xml +++ b/tests/integration/test_row_policy/normal_filter2_table2.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/normal_filters.xml b/tests/integration/test_row_policy/normal_filters.xml index 6f5cd8701f6..ab4e08eb308 100644 --- a/tests/integration/test_row_policy/normal_filters.xml +++ b/tests/integration/test_row_policy/normal_filters.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_row_policy/tags_with_db_and_table_names.xml b/tests/integration/test_row_policy/tags_with_db_and_table_names.xml index 992a1e63942..5ce438809d4 100644 --- a/tests/integration/test_row_policy/tags_with_db_and_table_names.xml +++ b/tests/integration/test_row_policy/tags_with_db_and_table_names.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_s3_with_https/configs/config.d/ssl.xml b/tests/integration/test_s3_with_https/configs/config.d/ssl.xml index 1200dc8c94b..d4cea955c68 100644 --- a/tests/integration/test_s3_with_https/configs/config.d/ssl.xml +++ b/tests/integration/test_s3_with_https/configs/config.d/ssl.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_s3_with_https/configs/config.xml b/tests/integration/test_s3_with_https/configs/config.xml index 8e7eada42ed..feb537ebbce 100644 --- a/tests/integration/test_s3_with_https/configs/config.xml +++ b/tests/integration/test_s3_with_https/configs/config.xml @@ -1,4 +1,3 @@ - 9000 127.0.0.1 diff --git a/tests/integration/test_s3_with_proxy/configs/config.xml b/tests/integration/test_s3_with_proxy/configs/config.xml index 8e7eada42ed..feb537ebbce 100644 --- a/tests/integration/test_s3_with_proxy/configs/config.xml +++ b/tests/integration/test_s3_with_proxy/configs/config.xml @@ -1,4 +1,3 @@ - 9000 127.0.0.1 diff --git a/tests/integration/test_select_access_rights/configs/another_user.xml b/tests/integration/test_select_access_rights/configs/another_user.xml index 627ebccdada..c9d480ab99a 100644 --- a/tests/integration/test_select_access_rights/configs/another_user.xml +++ b/tests/integration/test_select_access_rights/configs/another_user.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml b/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml index 0a3b16dbc84..d63b7b41ca2 100644 --- a/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml +++ b/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml @@ -1,4 +1,3 @@ - true diff --git a/tests/integration/test_server_reload/configs/default_passwd.xml b/tests/integration/test_server_reload/configs/default_passwd.xml index 5c23be0dcb0..f79149e7e23 100644 --- a/tests/integration/test_server_reload/configs/default_passwd.xml +++ b/tests/integration/test_server_reload/configs/default_passwd.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_server_reload/configs/ssl_conf.xml b/tests/integration/test_server_reload/configs/ssl_conf.xml index 43b25032059..67f1b64bb85 100644 --- a/tests/integration/test_server_reload/configs/ssl_conf.xml +++ b/tests/integration/test_server_reload/configs/ssl_conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_settings_constraints/configs/users.xml b/tests/integration/test_settings_constraints/configs/users.xml index 2ff02086e3e..de4d87b95a0 100644 --- a/tests/integration/test_settings_constraints/configs/users.xml +++ b/tests/integration/test_settings_constraints/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml b/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml index c41776f9e78..c6ac737b632 100644 --- a/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml +++ b/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_dict/configs/conf.xml b/tests/integration/test_storage_dict/configs/conf.xml index e37ca358e63..57b149c89d0 100644 --- a/tests/integration/test_storage_dict/configs/conf.xml +++ b/tests/integration/test_storage_dict/configs/conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_kafka/configs/users.xml b/tests/integration/test_storage_kafka/configs/users.xml index 797dfebba0e..2cef0a6de3c 100644 --- a/tests/integration/test_storage_kafka/configs/users.xml +++ b/tests/integration/test_storage_kafka/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_kerberized_kafka/configs/users.xml b/tests/integration/test_storage_kerberized_kafka/configs/users.xml index 797dfebba0e..2cef0a6de3c 100644 --- a/tests/integration/test_storage_kerberized_kafka/configs/users.xml +++ b/tests/integration/test_storage_kerberized_kafka/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_mysql/configs/users.xml b/tests/integration/test_storage_mysql/configs/users.xml index 074bf9f407e..d030ccb0e72 100644 --- a/tests/integration/test_storage_mysql/configs/users.xml +++ b/tests/integration/test_storage_mysql/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_nats/configs/users.xml b/tests/integration/test_storage_nats/configs/users.xml index 797dfebba0e..2cef0a6de3c 100644 --- a/tests/integration/test_storage_nats/configs/users.xml +++ b/tests/integration/test_storage_nats/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_postgresql/configs/settings.xml b/tests/integration/test_storage_postgresql/configs/settings.xml index 7054c274771..5d4c8f4c523 100644 --- a/tests/integration/test_storage_postgresql/configs/settings.xml +++ b/tests/integration/test_storage_postgresql/configs/settings.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_rabbitmq/configs/users.xml b/tests/integration/test_storage_rabbitmq/configs/users.xml index 797dfebba0e..2cef0a6de3c 100644 --- a/tests/integration/test_storage_rabbitmq/configs/users.xml +++ b/tests/integration/test_storage_rabbitmq/configs/users.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_storage_url/configs/conf.xml b/tests/integration/test_storage_url/configs/conf.xml index e3e8627d95e..790752c5c04 100644 --- a/tests/integration/test_storage_url/configs/conf.xml +++ b/tests/integration/test_storage_url/configs/conf.xml @@ -1,4 +1,3 @@ - diff --git a/tests/integration/test_structured_logging_json/configs/config_json.xml b/tests/integration/test_structured_logging_json/configs/config_json.xml index f20fda50319..d2e9e284f4e 100644 --- a/tests/integration/test_structured_logging_json/configs/config_json.xml +++ b/tests/integration/test_structured_logging_json/configs/config_json.xml @@ -1,4 +1,3 @@ -