thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable access management by default for all integration tests.

Browse Source
This commit is contained in:
Vitaly Baranov 2020-04-08 03:50:27 +03:00
parent 36a5b57ac4
commit c97d12a19c
18 changed files with 14 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/integration/test_access_control_on_cluster/configs/users.d/access_management.xml → tests/integration/helpers/0_common_instance_users.xml
View File

1
tests/integration/helpers/cluster.py
View File

@ -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()

13
tests/integration/test_allowed_client_hosts/configs/users.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<yandex>
<profiles>
<default>
</default>
</profiles>
<users>
<default>
<profile>default</profile>
<password></password>
</default>
</users>
</yandex>

7
tests/integration/test_authentication/configs/users.d/access_management.xml
View File

@ -1,7 +0,0 @@
<yandex>
<users>
<default>
<access_management>1</access_management>
</default>
</users>
</yandex>

2
tests/integration/test_authentication/test.py
View File

@ -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)

7
tests/integration/test_disk_access_storage/configs/users.d/access_management.xml
View File

@ -1,7 +0,0 @@
<yandex>
<users>
<default>
<access_management>1</access_management>
</default>
</users>
</yandex>

2
tests/integration/test_disk_access_storage/test.py
View File

@ -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)

7
tests/integration/test_grant_and_revoke/configs/users.d/access_management.xml
View File

@ -1,7 +0,0 @@
<yandex>
<users>
<default>
<access_management>1</access_management>
</default>
</users>
</yandex>

2
tests/integration/test_grant_and_revoke/test.py
View File

@ -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)

2
tests/integration/test_quota/configs/users.d/access_management.xml → tests/integration/test_quota/configs/users.d/assign_myquota.xml
View File

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

5
tests/integration/test_quota/configs/users.d/drop_default_quota.xml Normal file
View File

@ -0,0 +1,5 @@
<yandex>
<quotas>
<default remove="1"/>
</quotas>
</yandex>

17
tests/integration/test_quota/configs/users.xml
View File

@ -1,17 +0,0 @@
<?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>

7
tests/integration/test_row_policy/configs/users.d/access_management.xml
View File

@ -1,7 +0,0 @@
<yandex>
<users>
<default>
<access_management>1</access_management>
</default>
</users>
</yandex>

0
tests/integration/test_settings_constraints_distributed/configs/config.d/remote_servers.xml → tests/integration/test_settings_constraints_distributed/configs/remote_servers.xml
View File

7
tests/integration/test_settings_constraints_distributed/configs/users.d/access_management.xml
View File

@ -1,7 +0,0 @@
<yandex>
<users>
<default>
<access_management>1</access_management>
</default>
</users>
</yandex>

6
tests/integration/test_settings_constraints_distributed/test.py
View File

@ -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")

7
tests/integration/test_settings_profile/configs/users.d/access_management.xml
View File

@ -1,7 +0,0 @@
<yandex>
<users>
<default>
<access_management>1</access_management>
</default>
</users>
</yandex>

2
tests/integration/test_settings_profile/test.py
View File

@ -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)