Enable access management by default for all integration tests.

tests/integration/helpers/cluster.py

@@ -923,6 +923,7 @@ class ClickHouseInstance:
 
         # The file is named with 0_ prefix to be processed before other configuration overloads.
         shutil.copy(p.join(HELPERS_DIR, '0_common_instance_config.xml'), self.config_d_dir)
+        shutil.copy(p.join(HELPERS_DIR, '0_common_instance_users.xml'), users_d_dir)
 
         # Generate and write macros file
         macros = self.macros.copy()

tests/integration/test_allowed_client_hosts/configs/users.xml

-<?xml version="1.0"?>
-<yandex>
-    <profiles>
-        <default>
-        </default>
-    </profiles>
-    <users>
-        <default>
-            <profile>default</profile>
-            <password></password>
-        </default>
-    </users>
-</yandex>

tests/integration/test_authentication/configs/users.d/access_management.xml

-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>

tests/integration/test_authentication/test.py

@@ -2,7 +2,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance('instance', config_dir="configs")
+instance = cluster.add_instance('instance')
 
 
 @pytest.fixture(scope="module", autouse=True)

tests/integration/test_disk_access_storage/configs/users.d/access_management.xml

-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>

tests/integration/test_disk_access_storage/test.py

@@ -2,7 +2,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance('instance', config_dir='configs', stay_alive=True)
+instance = cluster.add_instance('instance', stay_alive=True)
 
 
 @pytest.fixture(scope="module", autouse=True)

tests/integration/test_grant_and_revoke/test.py

@@ -3,7 +3,7 @@ from helpers.cluster import ClickHouseCluster
 import re
 
 cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance('instance', config_dir="configs")
+instance = cluster.add_instance('instance')
 
 
 @pytest.fixture(scope="module", autouse=True)

tests/integration/test_quota/configs/users.d/access_management.xml

-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>

tests/integration/test_grant_and_revoke/configs/users.d/access_management.xml → tests/integration/test_quota/configs/users.d/assign_myquota.xml

 <yandex>
     <users>
         <default>
-            <access_management>1</access_management>
+            <quota>myQuota</quota>
         </default>
     </users>
 </yandex>

tests/integration/test_quota/configs/users.d/drop_default_quota.xml

+<yandex>
+    <quotas>
+        <default remove="1"/>
+    </quotas>
+</yandex>

tests/integration/test_quota/configs/users.xml

-<?xml version="1.0"?>
-<yandex>
-    <profiles>
-        <default>
-        </default>
-    </profiles>
-    <users>
-        <default>
-            <password></password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>myQuota</quota>
-        </default>
-    </users>
-</yandex>

tests/integration/test_row_policy/configs/users.d/access_management.xml

-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>

tests/integration/test_settings_constraints_distributed/configs/users.d/access_management.xml

-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>

tests/integration/test_settings_constraints_distributed/test.py

@@ -8,9 +8,9 @@ from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
 
-node1 = cluster.add_instance('node1', config_dir="configs")
-node2 = cluster.add_instance('node2', config_dir="configs")
-distributed = cluster.add_instance('distributed', config_dir="configs")
+node1 = cluster.add_instance('node1')
+node2 = cluster.add_instance('node2')
+distributed = cluster.add_instance('distributed', main_configs=["configs/remote_servers.xml"])
 
 
 @pytest.fixture(scope="module")

tests/integration/test_settings_profile/configs/users.d/access_management.xml

-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>

tests/integration/test_settings_profile/test.py

@@ -2,7 +2,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance('instance', config_dir="configs")
+instance = cluster.add_instance('instance')
 
 
 @pytest.fixture(scope="module", autouse=True)