Fix tests

2024-09-19 16:20:50 +00:00 · 2023-06-08 20:30:34 +02:00 · 2023-06-08 20:30:34 +02:00 · 6c48aba693
commit 6c48aba693
parent c6acdd7008
22 changed files with 102 additions and 9 deletions
--- a/tests/integration/helpers/0_common_instance_users.xml
+++ b/tests/integration/helpers/0_common_instance_users.xml
@ -1,11 +1,7 @@
 <clickhouse>
    <users>
        <default>
-            <grants>
-                <query>GRANT ACCESS MANAGEMENT ON *.* WITH GRANT OPTION</query>
-                <query>GRANT ALL ON *.* WITH GRANT OPTION</query>
-                <query>GRANT USE NAMED COLLECTION ON * WITH GRANT OPTION</query>
-            </grants>
+            <access_management>1</access_management>
        </default>
    </users>
 </clickhouse>
--- a/tests/integration/test_dictionaries_mysql/configs/users.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/users.xml
@ -12,6 +12,7 @@
            </networks>
            <profile>default</profile>
            <quota>default</quota>
+            <named_collection_control>1</named_collection_control>
        </default>
    </users>

--- a/tests/integration/test_dictionaries_mysql/test.py
+++ b/tests/integration/test_dictionaries_mysql/test.py
@ -8,9 +8,10 @@ import logging

 DICTS = ["configs/dictionaries/mysql_dict1.xml", "configs/dictionaries/mysql_dict2.xml"]
 CONFIG_FILES = ["configs/remote_servers.xml", "configs/named_collections.xml"]
+USER_CONFIGS = ["configs/users.xml"]
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
-    "instance", main_configs=CONFIG_FILES, with_mysql=True, dictionaries=DICTS
+    "instance", main_configs=CONFIG_FILES, user_configs=USER_CONFIGS, with_mysql=True, dictionaries=DICTS
 )

 create_table_mysql_template = """
--- a/tests/integration/test_dictionaries_postgresql/configs/users.xml
+++ b/tests/integration/test_dictionaries_postgresql/configs/users.xml
@ -0,0 +1,10 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <quota>default</quota>
+            <use_named_collections>1</use_named_collections>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_mysql_database_engine/configs/users.xml
+++ b/tests/integration/test_mysql_database_engine/configs/users.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_mysql_database_engine/test.py
+++ b/tests/integration/test_mysql_database_engine/test.py
@ -12,6 +12,7 @@ cluster = ClickHouseCluster(__file__)
 clickhouse_node = cluster.add_instance(
    "node1",
    main_configs=["configs/remote_servers.xml", "configs/named_collections.xml"],
+    user_configs=["configs/users.xml"],
    with_mysql=True,
    stay_alive=True,
 )
--- a/tests/integration/test_named_collections/configs/users.d/0a_users_no_default_access.xml
+++ b/tests/integration/test_named_collections/configs/users.d/0a_users_no_default_access.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_postgresql_database_engine/configs/users.xml
+++ b/tests/integration/test_postgresql_database_engine/configs/users.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_postgresql_database_engine/test.py
+++ b/tests/integration/test_postgresql_database_engine/test.py
@ -8,7 +8,7 @@ from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT

 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
-    "node1", main_configs=["configs/named_collections.xml"], with_postgres=True
+    "node1", main_configs=["configs/named_collections.xml"], user_configs=["configs/users.xml"], with_postgres=True
 )

 postgres_table_template = """
--- a/tests/integration/test_postgresql_replica_database_engine_2/configs/users.xml
+++ b/tests/integration/test_postgresql_replica_database_engine_2/configs/users.xml
@ -4,4 +4,11 @@
            <allow_experimental_database_materialized_postgresql>1</allow_experimental_database_materialized_postgresql>
        </default>
    </profiles>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
 </clickhouse>
--- a/tests/integration/test_redirect_url_storage/configs/users.xml
+++ b/tests/integration/test_redirect_url_storage/configs/users.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_redirect_url_storage/test.py
+++ b/tests/integration/test_redirect_url_storage/test.py
@ -9,6 +9,7 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
    "node1",
    main_configs=["configs/named_collections.xml"],
+    user_configs=["configs/user.xml"],
    with_zookeeper=False,
    with_hdfs=True,
 )
--- a/tests/integration/test_storage_mongodb/configs/users.xml
+++ b/tests/integration/test_storage_mongodb/configs/users.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@ -17,6 +17,7 @@ def started_cluster(request):
                "configs_secure/config.d/ssl_conf.xml",
                "configs/named_collections.xml",
            ],
+            user_configs=["configs/users.xml"],
            with_mongo=True,
            with_mongo_secure=request.param,
        )
--- a/tests/integration/test_storage_mysql/configs/users.xml
+++ b/tests/integration/test_storage_mysql/configs/users.xml
@ -12,6 +12,7 @@
                <ip>::/0</ip>
            </networks>
            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
        </default>
    </users>
 </clickhouse>
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@ -13,6 +13,7 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
    "node1",
    main_configs=["configs/remote_servers.xml", "configs/named_collections.xml"],
+    user_configs=["configs/users.xml"],
    with_mysql=True,
 )
 node2 = cluster.add_instance(
--- a/tests/integration/test_storage_postgresql/configs/users.xml
+++ b/tests/integration/test_storage_postgresql/configs/users.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_storage_postgresql/test.py
+++ b/tests/integration/test_storage_postgresql/test.py
@ -7,7 +7,7 @@ from helpers.postgres_utility import get_postgres_conn

 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
-    "node1", main_configs=["configs/named_collections.xml"], with_postgres=True
+    "node1", main_configs=["configs/named_collections.xml"], user_configs=["configs/users.xml"], with_postgres=True
 )
 node2 = cluster.add_instance(
    "node2",
--- a/tests/integration/test_storage_s3/configs/users.xml
+++ b/tests/integration/test_storage_s3/configs/users.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@ -55,7 +55,7 @@ def started_cluster():
                "configs/named_collections.xml",
                "configs/schema_cache.xml",
            ],
-            user_configs=["configs/access.xml"],
+            user_configs=["configs/access.xml", "configs/users.xml"],
        )
        cluster.add_instance(
            "s3_max_redirects",
--- a/tests/integration/test_table_function_mongodb/configs/users.xml
+++ b/tests/integration/test_table_function_mongodb/configs/users.xml
@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
--- a/tests/integration/test_table_function_mongodb/test.py
+++ b/tests/integration/test_table_function_mongodb/test.py
@ -16,6 +16,7 @@ def started_cluster(request):
            main_configs=[
                "configs_secure/config.d/ssl_conf.xml",
            ],
+            user_configs=["configs/users.xml"],
            with_mongo_secure=request.param,
        )
        cluster.start()