From b4e0ca3b0a72a7ae94eec2ac416fb6722b49074c Mon Sep 17 00:00:00 2001 From: Roman Vasin Date: Thu, 24 Aug 2023 14:23:46 +0000 Subject: [PATCH] Add test for nested nodes, add checks for presence of nodes in pre-processed config --- .../configs/config.xml | 8 ++++++++ .../configs/users.xml | 7 +++++++ .../test_config_hidden_attributes/test.py | 18 +++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/integration/test_config_hidden_attributes/configs/users.xml diff --git a/tests/integration/test_config_hidden_attributes/configs/config.xml b/tests/integration/test_config_hidden_attributes/configs/config.xml index 7d622ef7bbc..8f5c6f2ed39 100644 --- a/tests/integration/test_config_hidden_attributes/configs/config.xml +++ b/tests/integration/test_config_hidden_attributes/configs/config.xml @@ -1,3 +1,11 @@ + + diff --git a/tests/integration/test_config_hidden_attributes/configs/users.xml b/tests/integration/test_config_hidden_attributes/configs/users.xml new file mode 100644 index 00000000000..7f196179f80 --- /dev/null +++ b/tests/integration/test_config_hidden_attributes/configs/users.xml @@ -0,0 +1,7 @@ + + + + 1 + + + diff --git a/tests/integration/test_config_hidden_attributes/test.py b/tests/integration/test_config_hidden_attributes/test.py index f7109022abd..7ab2cb0e225 100644 --- a/tests/integration/test_config_hidden_attributes/test.py +++ b/tests/integration/test_config_hidden_attributes/test.py @@ -2,8 +2,11 @@ import pytest import os from helpers.cluster import ClickHouseCluster + cluster = ClickHouseCluster(__file__) -node = cluster.add_instance("node", main_configs=["configs/config.xml"]) +node = cluster.add_instance( + "node", main_configs=["configs/config.xml"], user_configs=["configs/users.xml"] +) @pytest.fixture(scope="module") @@ -23,3 +26,16 @@ def test_hidden(started_cluster): ) == "60000000000\n" ) + assert ( + node.query( + "select value from system.server_settings where name ='max_partition_size_to_drop'" + ) + == "40000000000\n" + ) + assert "key_1" in node.query("select collection from system.named_collections") + out = node.exec_in_container( + ["cat", "/var/lib/clickhouse/preprocessed_configs/config.xml"] + ) + assert "max_table_size_to_drop" not in out + assert "max_partition_size_to_drop" in out + assert "named_collections" not in out