From cba6e39fe52c30816980c5320756fd9d6f8ea31a Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sat, 25 Sep 2021 07:08:34 +0300 Subject: [PATCH] Replace yandex to clickhouse in configs --- tests/integration/helpers/dictionary.py | 8 ++--- .../test_catboost_model_config_reload/test.py | 4 +-- .../integration/test_codec_encrypted/test.py | 4 +-- .../test_create_user_and_login/test.py | 4 +-- .../configs/named_collections.xml | 4 +-- .../configs/named_collections.xml | 4 +-- .../generate_dictionaries.py | 4 +-- tests/integration/test_encrypted_disk/test.py | 4 +-- .../integration/test_hedged_requests/test.py | 4 +-- .../test_hedged_requests_parallel/test.py | 4 +-- .../configs/named_collections.xml | 4 +-- .../configs/named_collections.xml | 4 +-- .../configs/named_collections.xml | 4 +-- .../test_reload_auxiliary_zookeepers/test.py | 8 ++--- .../test_reload_clusters_config/test.py | 16 +++++----- .../integration/test_reload_zookeeper/test.py | 6 ++-- .../test.py | 4 +-- .../test_replication_credentials/test.py | 8 ++--- .../test_rocksdb_options/configs/rocksdb.xml | 4 +-- tests/integration/test_secure_socket/test.py | 4 +-- .../configs/named_collections.xml | 4 +-- .../configs/named_collections.xml | 4 +-- .../configs/named_collections.xml | 4 +-- .../configs/named_collections.xml | 4 +-- tests/integration/test_system_queries/test.py | 2 +- tests/perf_drafts/vert_merge/test_merges | 4 +-- .../kerberos/requirements/requirements.md | 16 +++++----- .../kerberos/requirements/requirements.py | 32 +++++++++---------- tests/testflows/kerberos/tests/common.py | 8 ++--- tests/testflows/kerberos/tests/config.py | 2 +- .../requirements/requirements.md | 8 ++--- .../requirements/requirements.py | 16 +++++----- .../ldap/authentication/tests/common.py | 4 +-- .../authentication/tests/server_config.py | 4 +-- .../requirements/requirements.md | 8 ++--- .../requirements/requirements.py | 16 +++++----- .../external_user_directory/tests/common.py | 2 +- .../tests/server_config.py | 4 +-- .../role_mapping/requirements/requirements.md | 8 ++--- .../role_mapping/requirements/requirements.py | 16 +++++----- 40 files changed, 136 insertions(+), 136 deletions(-) diff --git a/tests/integration/helpers/dictionary.py b/tests/integration/helpers/dictionary.py index b32b516d82c..99c4e3a5a5d 100644 --- a/tests/integration/helpers/dictionary.py +++ b/tests/integration/helpers/dictionary.py @@ -316,7 +316,7 @@ class Dictionary(object): with open(self.config_path, 'w') as result: if 'direct' not in self.structure.layout.get_str(): result.write(''' - + {min_lifetime} @@ -328,7 +328,7 @@ class Dictionary(object): {source} - + '''.format( min_lifetime=self.min_lifetime, max_lifetime=self.max_lifetime, @@ -338,7 +338,7 @@ class Dictionary(object): )) else: result.write(''' - + {name} {structure} @@ -346,7 +346,7 @@ class Dictionary(object): {source} - + '''.format( min_lifetime=self.min_lifetime, max_lifetime=self.max_lifetime, diff --git a/tests/integration/test_catboost_model_config_reload/test.py b/tests/integration/test_catboost_model_config_reload/test.py index 27652ba365e..4059e739dc9 100644 --- a/tests/integration/test_catboost_model_config_reload/test.py +++ b/tests/integration/test_catboost_model_config_reload/test.py @@ -17,9 +17,9 @@ def copy_file_to_container(local_path, dist_path, container_id): os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path)) -config = ''' +config = ''' /etc/clickhouse-server/model/{model_config} -''' +''' @pytest.fixture(scope="module") diff --git a/tests/integration/test_codec_encrypted/test.py b/tests/integration/test_codec_encrypted/test.py index 5d47948ac3c..439fcdd8ef8 100644 --- a/tests/integration/test_codec_encrypted/test.py +++ b/tests/integration/test_codec_encrypted/test.py @@ -19,7 +19,7 @@ def start_cluster(): def make_storage_with_key(id): node.exec_in_container(["bash", "-c" , """cat > /etc/clickhouse-server/config.d/storage_keys_config.xml << EOF - + 83e84e9a4eb11535c0670dc62d808ee0 @@ -32,7 +32,7 @@ def make_storage_with_key(id): {cur_id} - + EOF""".format(cur_id=id)]) node.query("SYSTEM RELOAD CONFIG") diff --git a/tests/integration/test_create_user_and_login/test.py b/tests/integration/test_create_user_and_login/test.py index d0edde2233b..2ce134fea1a 100644 --- a/tests/integration/test_create_user_and_login/test.py +++ b/tests/integration/test_create_user_and_login/test.py @@ -58,13 +58,13 @@ def test_login_as_dropped_user_xml(): instance.exec_in_container(["bash", "-c" , """ cat > /etc/clickhouse-server/users.d/user_c.xml << EOF - + - + EOF"""]) assert_eq_with_retry(instance, "SELECT name FROM system.users WHERE name='C'", "C") diff --git a/tests/integration/test_dictionaries_mysql/configs/named_collections.xml b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml index 0b591579247..e6e8d0c239f 100644 --- a/tests/integration/test_dictionaries_mysql/configs/named_collections.xml +++ b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml @@ -1,4 +1,4 @@ - + root @@ -22,4 +22,4 @@ test_table
 - + diff --git a/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml b/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml index 676cab2087d..647840848fd 100644 --- a/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml +++ b/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml @@ -1,4 +1,4 @@ - + postgres @@ -31,4 +31,4 @@ postgres1 - + diff --git a/tests/integration/test_dictionaries_select_all/generate_dictionaries.py b/tests/integration/test_dictionaries_select_all/generate_dictionaries.py index 109ecea438e..4208615bdc3 100644 --- a/tests/integration/test_dictionaries_select_all/generate_dictionaries.py +++ b/tests/integration/test_dictionaries_select_all/generate_dictionaries.py @@ -44,7 +44,7 @@ def generate_structure(): def generate_dictionaries(path, structure): dictionary_skeleton = ''' - + {name} @@ -69,7 +69,7 @@ def generate_dictionaries(path, structure): {parent} - ''' + ''' attribute_skeleton = ''' %s_ diff --git a/tests/integration/test_encrypted_disk/test.py b/tests/integration/test_encrypted_disk/test.py index 542980bcaaa..7d94f7ccdc5 100644 --- a/tests/integration/test_encrypted_disk/test.py +++ b/tests/integration/test_encrypted_disk/test.py @@ -115,7 +115,7 @@ def test_add_key(): def make_storage_policy_with_keys(policy_name, keys): node.exec_in_container(["bash", "-c" , """cat > /etc/clickhouse-server/config.d/storage_policy_{policy_name}.xml << EOF - + <{policy_name}_disk> @@ -135,7 +135,7 @@ def test_add_key(): - + EOF""".format(policy_name=policy_name, keys=keys)]) node.query("SYSTEM RELOAD CONFIG") diff --git a/tests/integration/test_hedged_requests/test.py b/tests/integration/test_hedged_requests/test.py index e40b3109c44..b137dadfca9 100644 --- a/tests/integration/test_hedged_requests/test.py +++ b/tests/integration/test_hedged_requests/test.py @@ -46,14 +46,14 @@ def started_cluster(): cluster.shutdown() -config = ''' +config = ''' {sleep_in_send_tables_status_ms} {sleep_in_send_data_ms} -''' +''' def check_query(expected_replica, receive_timeout=300): diff --git a/tests/integration/test_hedged_requests_parallel/test.py b/tests/integration/test_hedged_requests_parallel/test.py index 7abc2eb1d2a..3ea6cf80622 100644 --- a/tests/integration/test_hedged_requests_parallel/test.py +++ b/tests/integration/test_hedged_requests_parallel/test.py @@ -45,14 +45,14 @@ def started_cluster(): cluster.shutdown() -config = ''' +config = ''' {sleep_in_send_tables_status_ms} {sleep_in_send_data_ms} -''' +''' QUERY_1 = "SELECT count() FROM distributed" diff --git a/tests/integration/test_mysql_database_engine/configs/named_collections.xml b/tests/integration/test_mysql_database_engine/configs/named_collections.xml index b5e0973d37a..fd18dfa6202 100644 --- a/tests/integration/test_mysql_database_engine/configs/named_collections.xml +++ b/tests/integration/test_mysql_database_engine/configs/named_collections.xml @@ -1,4 +1,4 @@ - + root @@ -22,4 +22,4 @@ test_table
 - + diff --git a/tests/integration/test_postgresql_database_engine/configs/named_collections.xml b/tests/integration/test_postgresql_database_engine/configs/named_collections.xml index f084ee373ec..38a42b37443 100644 --- a/tests/integration/test_postgresql_database_engine/configs/named_collections.xml +++ b/tests/integration/test_postgresql_database_engine/configs/named_collections.xml @@ -1,4 +1,4 @@ - + postgres @@ -20,4 +20,4 @@ postgres - + diff --git a/tests/integration/test_redirect_url_storage/configs/named_collections.xml b/tests/integration/test_redirect_url_storage/configs/named_collections.xml index 17cc701344a..fde247989f8 100644 --- a/tests/integration/test_redirect_url_storage/configs/named_collections.xml +++ b/tests/integration/test_redirect_url_storage/configs/named_collections.xml @@ -1,4 +1,4 @@ - + @@ -13,4 +13,4 @@ - + diff --git a/tests/integration/test_reload_auxiliary_zookeepers/test.py b/tests/integration/test_reload_auxiliary_zookeepers/test.py index e01331269d0..a52f21b5e02 100644 --- a/tests/integration/test_reload_auxiliary_zookeepers/test.py +++ b/tests/integration/test_reload_auxiliary_zookeepers/test.py @@ -31,7 +31,7 @@ def test_reload_auxiliary_zookeepers(start_cluster): ) # Add an auxiliary zookeeper - new_config = """ + new_config = """ zoo1 @@ -59,7 +59,7 @@ def test_reload_auxiliary_zookeepers(start_cluster): -""" +""" node.replace_config("/etc/clickhouse-server/conf.d/zookeeper_config.xml", new_config) node.query("SYSTEM RELOAD CONFIG") @@ -72,7 +72,7 @@ def test_reload_auxiliary_zookeepers(start_cluster): node.query("ALTER TABLE simple2 ATTACH PARTITION '2020-08-27';") assert node.query("SELECT id FROM simple2").strip() == "1" - new_config = """ + new_config = """ zoo2 @@ -80,7 +80,7 @@ def test_reload_auxiliary_zookeepers(start_cluster): 2000 -""" +""" node.replace_config("/etc/clickhouse-server/conf.d/zookeeper_config.xml", new_config) node.query("SYSTEM RELOAD CONFIG") time.sleep(5) diff --git a/tests/integration/test_reload_clusters_config/test.py b/tests/integration/test_reload_clusters_config/test.py index f1fb0d820d4..048b704034b 100644 --- a/tests/integration/test_reload_clusters_config/test.py +++ b/tests/integration/test_reload_clusters_config/test.py @@ -36,7 +36,7 @@ def started_cluster(): base_config = ''' - + @@ -65,11 +65,11 @@ base_config = ''' - + ''' test_config1 = ''' - + @@ -94,11 +94,11 @@ test_config1 = ''' - + ''' test_config2 = ''' - + @@ -114,11 +114,11 @@ test_config2 = ''' - + ''' test_config3 = ''' - + @@ -156,7 +156,7 @@ test_config3 = ''' - + ''' diff --git a/tests/integration/test_reload_zookeeper/test.py b/tests/integration/test_reload_zookeeper/test.py index 1fe0ab13a7f..117baf2ebb9 100644 --- a/tests/integration/test_reload_zookeeper/test.py +++ b/tests/integration/test_reload_zookeeper/test.py @@ -46,7 +46,7 @@ def test_reload_zookeeper(start_cluster): ## remove zoo2, zoo3 from configs new_config = """ - + zoo1 @@ -79,7 +79,7 @@ def test_reload_zookeeper(start_cluster): ## set config to zoo2, server will be normal new_config = """ - + zoo2 @@ -87,7 +87,7 @@ def test_reload_zookeeper(start_cluster): 2000 - + """ node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config) node.query("SYSTEM RELOAD CONFIG") diff --git a/tests/integration/test_reloading_storage_configuration/test.py b/tests/integration/test_reloading_storage_configuration/test.py index 7fa37d0909c..e9fba6012f7 100644 --- a/tests/integration/test_reloading_storage_configuration/test.py +++ b/tests/integration/test_reloading_storage_configuration/test.py @@ -66,7 +66,7 @@ def add_disk(node, name, path, separate_file=False): tree = ET.parse(os.path.join(node.config_d_dir, "storage_configuration.xml")) except: tree = ET.ElementTree( - ET.fromstring('')) + ET.fromstring('')) root = tree.getroot() new_disk = ET.Element(name) new_path = ET.Element("path") @@ -90,7 +90,7 @@ def update_disk(node, name, path, keep_free_space_bytes, separate_file=False): os.path.join(node.config_d_dir, "storage_configuration.xml")) except: tree = ET.ElementTree( - ET.fromstring('')) + ET.fromstring('')) root = tree.getroot() disk = root.find("storage_configuration").find("disks").find(name) diff --git a/tests/integration/test_replication_credentials/test.py b/tests/integration/test_replication_credentials/test.py index 9181c515adf..359a8fc4b0d 100644 --- a/tests/integration/test_replication_credentials/test.py +++ b/tests/integration/test_replication_credentials/test.py @@ -114,7 +114,7 @@ def test_different_credentials(different_credentials_cluster): assert node6.query("SELECT id FROM test_table order by id") == '222\n' add_old = """ - + 9009 admin @@ -128,7 +128,7 @@ def test_different_credentials(different_credentials_cluster): 333 - + """ node5.replace_config("/etc/clickhouse-server/config.d/credentials1.xml", add_old) @@ -173,14 +173,14 @@ def test_credentials_and_no_credentials(credentials_and_no_credentials_cluster): assert node8.query("SELECT id FROM test_table order by id") == '222\n' allow_empty = """ - + 9009 admin 222 true - + """ # change state: Flip node7 to mixed auth/non-auth (allow node8) diff --git a/tests/integration/test_rocksdb_options/configs/rocksdb.xml b/tests/integration/test_rocksdb_options/configs/rocksdb.xml index afb2d2776fc..c0ac49576fc 100644 --- a/tests/integration/test_rocksdb_options/configs/rocksdb.xml +++ b/tests/integration/test_rocksdb_options/configs/rocksdb.xml @@ -1,5 +1,5 @@ - + 8 @@ -19,4 +19,4 @@ - + diff --git a/tests/integration/test_secure_socket/test.py b/tests/integration/test_secure_socket/test.py index 65c789f9d02..c542b855258 100644 --- a/tests/integration/test_secure_socket/test.py +++ b/tests/integration/test_secure_socket/test.py @@ -9,13 +9,13 @@ cluster = ClickHouseCluster(__file__) NODES = {'node' + str(i): None for i in (1, 2)} -config = ''' +config = ''' {sleep_in_send_data_ms} -''' +''' @pytest.fixture(scope="module") diff --git a/tests/integration/test_storage_mongodb/configs/named_collections.xml b/tests/integration/test_storage_mongodb/configs/named_collections.xml index fcdcb85bd36..feb6b55af02 100644 --- a/tests/integration/test_storage_mongodb/configs/named_collections.xml +++ b/tests/integration/test_storage_mongodb/configs/named_collections.xml @@ -1,4 +1,4 @@ - + root @@ -9,4 +9,4 @@ simple_table
 - + diff --git a/tests/integration/test_storage_mysql/configs/named_collections.xml b/tests/integration/test_storage_mysql/configs/named_collections.xml index 45d28d521f7..4a97be7bd98 100644 --- a/tests/integration/test_storage_mysql/configs/named_collections.xml +++ b/tests/integration/test_storage_mysql/configs/named_collections.xml @@ -1,4 +1,4 @@ - + root @@ -22,4 +22,4 @@ test_table
 - + diff --git a/tests/integration/test_storage_postgresql/configs/named_collections.xml b/tests/integration/test_storage_postgresql/configs/named_collections.xml index 0fedfbe8207..129225f36b9 100644 --- a/tests/integration/test_storage_postgresql/configs/named_collections.xml +++ b/tests/integration/test_storage_postgresql/configs/named_collections.xml @@ -1,4 +1,4 @@ - + postgres @@ -30,4 +30,4 @@ test_replicas
 - + diff --git a/tests/integration/test_storage_s3/configs/named_collections.xml b/tests/integration/test_storage_s3/configs/named_collections.xml index 5af6d84859a..0618c5d8b24 100644 --- a/tests/integration/test_storage_s3/configs/named_collections.xml +++ b/tests/integration/test_storage_s3/configs/named_collections.xml @@ -1,4 +1,4 @@ - + http://minio1:9001/root/test_table @@ -6,4 +6,4 @@ minio123 - + diff --git a/tests/integration/test_system_queries/test.py b/tests/integration/test_system_queries/test.py index b159e8b4cf3..50f4afd1abe 100644 --- a/tests/integration/test_system_queries/test.py +++ b/tests/integration/test_system_queries/test.py @@ -97,7 +97,7 @@ def test_DROP_DNS_CACHE(started_cluster): def test_RELOAD_CONFIG_AND_MACROS(started_cluster): - macros = "ro" + macros = "ro" create_macros = 'echo "{}" > /etc/clickhouse-server/config.d/macros.xml'.format(macros) instance = cluster.instances['ch1'] diff --git a/tests/perf_drafts/vert_merge/test_merges b/tests/perf_drafts/vert_merge/test_merges index 848e7cc578c..d177e16fe3e 100755 --- a/tests/perf_drafts/vert_merge/test_merges +++ b/tests/perf_drafts/vert_merge/test_merges @@ -27,8 +27,8 @@ function read_src_data { } function set_vertical_alg { - echo "$1" | sudo tee /etc/clickhouse-server/conf.d/enable_vertical_merge_algorithm.xml >/dev/null - echo "0" | sudo tee /etc/clickhouse-server/conf.d/vertical_merge_algorithm_min_rows_to_activate.xml >/dev/null + echo "$1" | sudo tee /etc/clickhouse-server/conf.d/enable_vertical_merge_algorithm.xml >/dev/null + echo "0" | sudo tee /etc/clickhouse-server/conf.d/vertical_merge_algorithm_min_rows_to_activate.xml >/dev/null } function set_and_restart { diff --git a/tests/testflows/kerberos/requirements/requirements.md b/tests/testflows/kerberos/requirements/requirements.md index f9b91006ac6..f4d298c7572 100644 --- a/tests/testflows/kerberos/requirements/requirements.md +++ b/tests/testflows/kerberos/requirements/requirements.md @@ -108,26 +108,26 @@ version: 1.0 [ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example: ```xml - + - + ``` ```xml - + HTTP/clickhouse.example.com@EXAMPLE.COM - + ``` ```xml - + EXAMPLE.COM - + ``` #### RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections @@ -163,7 +163,7 @@ version: 1.0 [ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.: ```xml - + @@ -174,7 +174,7 @@ version: 1.0 - + ``` #### RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser diff --git a/tests/testflows/kerberos/requirements/requirements.py b/tests/testflows/kerberos/requirements/requirements.py index 95951be0cd6..774f533373a 100644 --- a/tests/testflows/kerberos/requirements/requirements.py +++ b/tests/testflows/kerberos/requirements/requirements.py @@ -64,26 +64,26 @@ RQ_SRS_016_Kerberos_Configuration_KerberosNotEnabled = Requirement( '[ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example:\n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' - '\n' + '\n' '```\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' ' HTTP/clickhouse.example.com@EXAMPLE.COM\n' ' \n' - '\n' + '\n' '```\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' ' EXAMPLE.COM\n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -177,7 +177,7 @@ RQ_SRS_016_Kerberos_ValidUser_XMLConfiguredUser = Requirement( '[ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.:\n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' ' \n' @@ -188,7 +188,7 @@ RQ_SRS_016_Kerberos_ValidUser_XMLConfiguredUser = Requirement( ' \n' ' \n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -626,26 +626,26 @@ version: 1.0 [ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example: ```xml - + - + ``` ```xml - + HTTP/clickhouse.example.com@EXAMPLE.COM - + ``` ```xml - + EXAMPLE.COM - + ``` #### RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections @@ -681,7 +681,7 @@ version: 1.0 [ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.: ```xml - + @@ -692,7 +692,7 @@ version: 1.0 - + ``` #### RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser diff --git a/tests/testflows/kerberos/tests/common.py b/tests/testflows/kerberos/tests/common.py index 8b72f1c2ffd..5dd0f734d8f 100644 --- a/tests/testflows/kerberos/tests/common.py +++ b/tests/testflows/kerberos/tests/common.py @@ -31,10 +31,10 @@ def xml_parse_file(filename): def create_default_config(filename): contents = "" if "kerberos_users.xml" in filename: - contents = "EXAMPLE.COM" \ - "" + contents = "EXAMPLE.COM" \ + "" elif "kerberos.xml" in filename: - contents = "EXAMPLE.COM" + contents = "EXAMPLE.COM" with open(filename, "w") as f: f.write(contents) @@ -104,7 +104,7 @@ def temp_erase(self, node, filename=None): try: with Then("I overwrite file to be dummy"): with open(filename, 'w') as f: - f.write("\n") + f.write("\n") node.restart() yield finally: diff --git a/tests/testflows/kerberos/tests/config.py b/tests/testflows/kerberos/tests/config.py index 85af0b3214e..35cec9527d8 100644 --- a/tests/testflows/kerberos/tests/config.py +++ b/tests/testflows/kerberos/tests/config.py @@ -19,7 +19,7 @@ def kerberos_not_enabled(self): config_path = f"kerberos/configs/{ch_nodes[0].name}/config.d/kerberos.xml" def modify_file(root): - return xmltree.fromstring("") + return xmltree.fromstring("") check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file, output="Kerberos is not enabled") diff --git a/tests/testflows/ldap/authentication/requirements/requirements.md b/tests/testflows/ldap/authentication/requirements/requirements.md index 372c44e20c5..a42e2eaa132 100644 --- a/tests/testflows/ldap/authentication/requirements/requirements.md +++ b/tests/testflows/ldap/authentication/requirements/requirements.md @@ -442,7 +442,7 @@ version: 2.0 configuration file or of any configuration file inside the `config.d` directory. ```xml - + localhost 636 @@ -458,7 +458,7 @@ configuration file or of any configuration file inside the `config.d` directory. /path/to/tls_ca_cert_dir ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384 - + ``` #### RQ.SRS-007.LDAP.Configuration.User.RBAC @@ -478,7 +478,7 @@ version: 1.0 an [LDAP] server inside the `users.xml` file or any configuration file inside the `users.d` directory. ```xml - + @@ -486,7 +486,7 @@ an [LDAP] server inside the `users.xml` file or any configuration file inside th - + ``` #### RQ.SRS-007.LDAP.Configuration.User.Name.Empty diff --git a/tests/testflows/ldap/authentication/requirements/requirements.py b/tests/testflows/ldap/authentication/requirements/requirements.py index 26ece91d188..97c85d93c86 100644 --- a/tests/testflows/ldap/authentication/requirements/requirements.py +++ b/tests/testflows/ldap/authentication/requirements/requirements.py @@ -867,7 +867,7 @@ RQ_SRS_007_LDAP_Configuration_Server_Syntax = Requirement( 'configuration file or of any configuration file inside the `config.d` directory.\n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' localhost\n' ' 636\n' @@ -883,7 +883,7 @@ RQ_SRS_007_LDAP_Configuration_Server_Syntax = Requirement( ' /path/to/tls_ca_cert_dir\n' ' ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384\n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -923,7 +923,7 @@ RQ_SRS_007_LDAP_Configuration_User_Syntax = Requirement( 'an [LDAP] server inside the `users.xml` file or any configuration file inside the `users.d` directory.\n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' ' \n' @@ -931,7 +931,7 @@ RQ_SRS_007_LDAP_Configuration_User_Syntax = Requirement( ' \n' ' \n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -1815,7 +1815,7 @@ version: 2.0 configuration file or of any configuration file inside the `config.d` directory. ```xml - + localhost 636 @@ -1831,7 +1831,7 @@ configuration file or of any configuration file inside the `config.d` directory. /path/to/tls_ca_cert_dir ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384 - + ``` #### RQ.SRS-007.LDAP.Configuration.User.RBAC @@ -1851,7 +1851,7 @@ version: 1.0 an [LDAP] server inside the `users.xml` file or any configuration file inside the `users.d` directory. ```xml - + @@ -1859,7 +1859,7 @@ an [LDAP] server inside the `users.xml` file or any configuration file inside th - + ``` #### RQ.SRS-007.LDAP.Configuration.User.Name.Empty diff --git a/tests/testflows/ldap/authentication/tests/common.py b/tests/testflows/ldap/authentication/tests/common.py index e1615f3ee97..a6bf11fd2cf 100644 --- a/tests/testflows/ldap/authentication/tests/common.py +++ b/tests/testflows/ldap/authentication/tests/common.py @@ -194,7 +194,7 @@ def create_ldap_servers_config_content(servers, config_d_dir="/etc/clickhouse-se path = os.path.join(config_d_dir, config_file) name = config_file - root = xmltree.fromstring("") + root = xmltree.fromstring("") xml_servers = root.find("ldap_servers") xml_servers.append(xmltree.Comment(text=f"LDAP servers {uid}")) @@ -231,7 +231,7 @@ def create_ldap_users_config_content(*users, config_d_dir="/etc/clickhouse-serve path = os.path.join(config_d_dir, config_file) name = config_file - root = xmltree.fromstring("") + root = xmltree.fromstring("") xml_users = root.find("users") xml_users.append(xmltree.Comment(text=f"LDAP users {uid}")) diff --git a/tests/testflows/ldap/authentication/tests/server_config.py b/tests/testflows/ldap/authentication/tests/server_config.py index 88b6bfa0325..87835ddc7d3 100644 --- a/tests/testflows/ldap/authentication/tests/server_config.py +++ b/tests/testflows/ldap/authentication/tests/server_config.py @@ -254,7 +254,7 @@ def invalid_verification_cooldown_value(self, invalid_value, timeout=300): def syntax(self): """Check that server configuration with valid syntax can be loaded. ```xml - + localhost 636 @@ -270,7 +270,7 @@ def syntax(self): /path/to/tls_ca_cert_dir ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384 - + ``` """ servers = { diff --git a/tests/testflows/ldap/external_user_directory/requirements/requirements.md b/tests/testflows/ldap/external_user_directory/requirements/requirements.md index 8159df710bb..44c9bdf4c67 100644 --- a/tests/testflows/ldap/external_user_directory/requirements/requirements.md +++ b/tests/testflows/ldap/external_user_directory/requirements/requirements.md @@ -611,7 +611,7 @@ version: 2.0 configuration file or of any configuration file inside the `config.d` directory. ```xml - + localhost 636 @@ -627,7 +627,7 @@ configuration file or of any configuration file inside the `config.d` directory. /path/to/tls_ca_cert_dir ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384 - + ``` ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory @@ -649,7 +649,7 @@ version: 1.0 [ClickHouse] SHALL support `` section with the following syntax ```xml - + my_ldap_server @@ -659,7 +659,7 @@ version: 1.0 - + ``` ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server diff --git a/tests/testflows/ldap/external_user_directory/requirements/requirements.py b/tests/testflows/ldap/external_user_directory/requirements/requirements.py index c7dcc44cc3a..90969725725 100644 --- a/tests/testflows/ldap/external_user_directory/requirements/requirements.py +++ b/tests/testflows/ldap/external_user_directory/requirements/requirements.py @@ -1166,7 +1166,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Syntax = Requirement( 'configuration file or of any configuration file inside the `config.d` directory.\n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' localhost\n' ' 636\n' @@ -1182,7 +1182,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Syntax = Requirement( ' /path/to/tls_ca_cert_dir\n' ' ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384\n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -1234,7 +1234,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Syntax = Requirement( '[ClickHouse] SHALL support `` section with the following syntax\n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' ' my_ldap_server\n' @@ -1244,7 +1244,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Syntax = Requirement( ' \n' ' \n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -2403,7 +2403,7 @@ version: 2.0 configuration file or of any configuration file inside the `config.d` directory. ```xml - + localhost 636 @@ -2419,7 +2419,7 @@ configuration file or of any configuration file inside the `config.d` directory. /path/to/tls_ca_cert_dir ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384 - + ``` ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory @@ -2441,7 +2441,7 @@ version: 1.0 [ClickHouse] SHALL support `` section with the following syntax ```xml - + my_ldap_server @@ -2451,7 +2451,7 @@ version: 1.0 - + ``` ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server diff --git a/tests/testflows/ldap/external_user_directory/tests/common.py b/tests/testflows/ldap/external_user_directory/tests/common.py index f6d1654efd6..6256fcd1f39 100644 --- a/tests/testflows/ldap/external_user_directory/tests/common.py +++ b/tests/testflows/ldap/external_user_directory/tests/common.py @@ -93,7 +93,7 @@ def create_entries_ldap_external_user_directory_config_content(entries, config_d path = os.path.join(config_d_dir, config_file) name = config_file - root = xmltree.fromstring("") + root = xmltree.fromstring("") xml_user_directories = root.find("user_directories") xml_user_directories.append(xmltree.Comment(text=f"LDAP external user directories {uid}")) diff --git a/tests/testflows/ldap/external_user_directory/tests/server_config.py b/tests/testflows/ldap/external_user_directory/tests/server_config.py index 4bf76f373e0..ac6cfa154a6 100644 --- a/tests/testflows/ldap/external_user_directory/tests/server_config.py +++ b/tests/testflows/ldap/external_user_directory/tests/server_config.py @@ -268,7 +268,7 @@ def invalid_verification_cooldown_value(self, invalid_value, timeout=300): def syntax(self): """Check that server configuration with valid syntax can be loaded. ```xml - + localhost 636 @@ -284,7 +284,7 @@ def syntax(self): /path/to/tls_ca_cert_dir ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384 - + ``` """ servers = { diff --git a/tests/testflows/ldap/role_mapping/requirements/requirements.md b/tests/testflows/ldap/role_mapping/requirements/requirements.md index 1225e35bb3c..e857694f520 100644 --- a/tests/testflows/ldap/role_mapping/requirements/requirements.md +++ b/tests/testflows/ldap/role_mapping/requirements/requirements.md @@ -306,7 +306,7 @@ with the actual user name during each authentication attempt. For example, ```xml - + @@ -314,7 +314,7 @@ For example, - + ``` ##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN @@ -397,7 +397,7 @@ of the `config.xml`. For example, ```xml - + @@ -410,7 +410,7 @@ For example, - + ``` #### Special Characters Escaping diff --git a/tests/testflows/ldap/role_mapping/requirements/requirements.py b/tests/testflows/ldap/role_mapping/requirements/requirements.py index f38e12f880c..5fb8c646483 100644 --- a/tests/testflows/ldap/role_mapping/requirements/requirements.py +++ b/tests/testflows/ldap/role_mapping/requirements/requirements.py @@ -456,7 +456,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN = Requirement( 'For example, \n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' ' \n' @@ -464,7 +464,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN = Requirement( ' \n' ' \n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -601,7 +601,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax = Req 'For example,\n' '\n' '```xml\n' - '\n' + '\n' ' \n' ' \n' ' \n' @@ -614,7 +614,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax = Req ' \n' ' \n' ' \n' - '\n' + '\n' '```\n' '\n' ), @@ -1366,7 +1366,7 @@ with the actual user name during each authentication attempt. For example, ```xml - + @@ -1374,7 +1374,7 @@ For example, - + ``` ##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN @@ -1457,7 +1457,7 @@ of the `config.xml`. For example, ```xml - + @@ -1470,7 +1470,7 @@ For example, - + ``` #### Special Characters Escaping