From e9ffc383da0e544cc01bbad7717dae3f566e95f5 Mon Sep 17 00:00:00 2001 From: helifu Date: Sat, 27 May 2023 22:56:00 +0800 Subject: [PATCH] Add input parameter 'base_config_dir' --- .../test_system_logs/configs/config.xml | 6 +++ .../test_system_logs/configs/users.xml | 38 +++++++++++++++++++ .../test_system_logs/test_system_logs.py | 7 ++-- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 tests/integration/test_system_logs/configs/users.xml diff --git a/tests/integration/test_system_logs/configs/config.xml b/tests/integration/test_system_logs/configs/config.xml index 0b5d4673804..e972f199568 100644 --- a/tests/integration/test_system_logs/configs/config.xml +++ b/tests/integration/test_system_logs/configs/config.xml @@ -6,4 +6,10 @@ 1000M 10 + + 8123 + 9000 + 127.0.0.1 + 9009 + 127.0.0.1 diff --git a/tests/integration/test_system_logs/configs/users.xml b/tests/integration/test_system_logs/configs/users.xml new file mode 100644 index 00000000000..1c6cd38a05c --- /dev/null +++ b/tests/integration/test_system_logs/configs/users.xml @@ -0,0 +1,38 @@ + + + + 10000000000 + 64999 + random + + + + 1 + + + + + + + + ::/0 + + default + + default + + + + + + + 3600 + 0 + 0 + 0 + 0 + 0 + + + + diff --git a/tests/integration/test_system_logs/test_system_logs.py b/tests/integration/test_system_logs/test_system_logs.py index 134a2990c45..aac5ee53819 100644 --- a/tests/integration/test_system_logs/test_system_logs.py +++ b/tests/integration/test_system_logs/test_system_logs.py @@ -9,14 +9,15 @@ cluster = ClickHouseCluster(__file__) node1 = cluster.add_instance( "node1", - main_configs=["configs/config.xml", "configs/config.d/system_logs_order_by.xml"], + base_config_dir="configs", + main_configs=["configs/config.d/system_logs_order_by.xml"], stay_alive=True, ) node2 = cluster.add_instance( "node2", + base_config_dir="configs", main_configs=[ - "configs/config.xml", "configs/config.d/system_logs_engine.xml", "configs/config.d/disks.xml", ], @@ -25,8 +26,8 @@ node2 = cluster.add_instance( node3 = cluster.add_instance( "node3", + base_config_dir="configs", main_configs=[ - "configs/config.xml", "configs/config.d/system_logs_settings.xml", "configs/config.d/disks.xml", ],