tests/functional/{serverless,tenants}: parametrize for feature flag EnableAlterDatabaseCreateHiveFirst

tests/functional/{serverless,tenants}: parametrize for feature flag EnableAlterDatabaseCreateHiveFirst

5 files changed, 54 insertions, 7 deletions

diff --git a/ydb/tests/functional/serverless/conftest.py b/ydb/tests/functional/serverless/conftest.py
index bc197561d2c..0566c694583 100644
--- a/ydb/tests/functional/serverless/conftest.py
+++ b/ydb/tests/functional/serverless/conftest.py
@@ -16,8 +16,8 @@ logger = logging.getLogger(__name__)
 
 
 @pytest.fixture(scope='module')
-def metering_file_path(ydb_cluster_configuration):
-    return ydb_cluster_configuration.metering_file_path
+def metering_file_path(ydb_configurator):
+    return ydb_configurator.metering_file_path
 
 
 @contextlib.contextmanager
diff --git a/ydb/tests/functional/serverless/test.py b/ydb/tests/functional/serverless/test.py
index c834e26b7f4..2c00f2d21ac 100644
--- a/ydb/tests/functional/serverless/test.py
+++ b/ydb/tests/functional/serverless/test.py
@@ -3,8 +3,9 @@ import functools
 import logging
 import os
 import time
-
+import copy
 import pytest
+
 from hamcrest import assert_that, contains_inanyorder, not_none
 from tornado import gen
 from tornado.ioloop import IOLoop
@@ -45,6 +46,19 @@ CLUSTER_CONFIG = dict(
 )
 
 
+@pytest.fixture(scope='module', params=[True, False], ids=['enable_alter_database_create_hive_first--true', 'enable_alter_database_create_hive_first--false'])
+def enable_alter_database_create_hive_first(request):
+    return request.param
+
+
+# ydb_fixtures.ydb_cluster_configuration local override
+@pytest.fixture(scope='module')
+def ydb_cluster_configuration(enable_alter_database_create_hive_first):
+    conf = copy.deepcopy(CLUSTER_CONFIG)
+    conf['enable_alter_database_create_hive_first'] = enable_alter_database_create_hive_first
+    return conf
+
+
 def test_fixtures(ydb_hostel_db, ydb_serverless_db):
     logger.debug(
         "test for serverless db %s over hostel db %s", ydb_serverless_db, ydb_hostel_db
diff --git a/ydb/tests/functional/tenants/test_dynamic_tenants.py b/ydb/tests/functional/tenants/test_dynamic_tenants.py
index e657b7ef937..b9d87618a54 100644
--- a/ydb/tests/functional/tenants/test_dynamic_tenants.py
+++ b/ydb/tests/functional/tenants/test_dynamic_tenants.py
@@ -2,6 +2,8 @@
 import os
 import logging
 import time
+import copy
+import pytest
 
 from hamcrest import (
     any_of,
@@ -43,6 +45,19 @@ CLUSTER_CONFIG = dict(
 )
 
 
+@pytest.fixture(scope='module', params=[True, False], ids=['enable_alter_database_create_hive_first--true', 'enable_alter_database_create_hive_first--false'])
+def enable_alter_database_create_hive_first(request):
+    return request.param
+
+
+# ydb_fixtures.ydb_cluster_configuration local override
+@pytest.fixture(scope='module')
+def ydb_cluster_configuration(enable_alter_database_create_hive_first):
+    conf = copy.deepcopy(CLUSTER_CONFIG)
+    conf['enable_alter_database_create_hive_first'] = enable_alter_database_create_hive_first
+    return conf
+
+
 def test_create_tenant_no_cpu(ydb_cluster):
     database = '/Root/users/database'
     ydb_cluster.create_database(
diff --git a/ydb/tests/functional/tenants/test_tenants.py b/ydb/tests/functional/tenants/test_tenants.py
index 78fb720d959..e941faeae09 100644
--- a/ydb/tests/functional/tenants/test_tenants.py
+++ b/ydb/tests/functional/tenants/test_tenants.py
@@ -3,6 +3,7 @@ import os
 import logging
 import random
 import time
+import copy
 import pytest
 
 from hamcrest import assert_that, greater_than, is_, not_, none
@@ -36,10 +37,22 @@ CLUSTER_CONFIG = dict(
         'KQP_COMPILE_ACTOR': LogLevels.CRIT,
         'PERSQUEUE_CLUSTER_TRACKER': LogLevels.CRIT,
     },
-    enable_alter_database_create_hive_first=True,
 )
 
 
+@pytest.fixture(scope='module', params=[True, False], ids=['enable_alter_database_create_hive_first--true', 'enable_alter_database_create_hive_first--false'])
+def enable_alter_database_create_hive_first(request):
+    return request.param
+
+
+# ydb_fixtures.ydb_cluster_configuration local override
+@pytest.fixture(scope='module')
+def ydb_cluster_configuration(enable_alter_database_create_hive_first):
+    conf = copy.deepcopy(CLUSTER_CONFIG)
+    conf['enable_alter_database_create_hive_first'] = enable_alter_database_create_hive_first
+    return conf
+
+
 class TestTenants():
 
     def test_create_remove_database(self, ydb_database):
diff --git a/ydb/tests/library/harness/ydb_fixtures.py b/ydb/tests/library/harness/ydb_fixtures.py
index 3b4182fda29..766663941be 100644
--- a/ydb/tests/library/harness/ydb_fixtures.py
+++ b/ydb/tests/library/harness/ydb_fixtures.py
@@ -31,18 +31,23 @@ DEFAULT_CLUSTER_CONFIG = dict(
 @pytest.fixture(scope='module')
 def ydb_cluster_configuration(request):
     conf = getattr(request.module, 'CLUSTER_CONFIG', DEFAULT_CLUSTER_CONFIG)
-    return KikimrConfigGenerator(**conf)
+    return conf
 
 
 @pytest.fixture(scope='module')
-def ydb_cluster(ydb_cluster_configuration, request):
+def ydb_configurator(ydb_cluster_configuration):
+    return KikimrConfigGenerator(**ydb_cluster_configuration)
+
+
+@pytest.fixture(scope='module')
+def ydb_cluster(ydb_configurator, request):
     module_name = request.module.__name__
 
     logger.info("setup ydb_cluster for %s", module_name)
 
     logger.info("setup ydb_cluster as local")
     cluster = kikimr_cluster_factory(
-        configurator=ydb_cluster_configuration
+        configurator=ydb_configurator,
     )
     cluster.is_local_test = True