stable-25-1: ability to test different ydb flavours (ydb-platform#16681)

Author: maximyurchuk

ydb/tests/functional/tenants/conftest.py

@@ -7,7 +7,7 @@
 # but somehow it does not
 #
 # for ydb_{cluster, database, ...} fixture family
-pytest_plugins = 'ydb.tests.library.fixtures'
+pytest_plugins = ['ydb.tests.library.fixtures', 'ydb.tests.library.flavours']
 
 
 @pytest.fixture(scope='module')

ydb/tests/functional/tenants/test_users_groups_with_acl.py

@@ -19,8 +19,8 @@ def domain_login_only(request):
 
 
 @pytest.fixture(scope='module')
-def ydb_configurator(ydb_cluster_configuration, domain_login_only):
-    config_generator = KikimrConfigGenerator(**ydb_cluster_configuration)
+def ydb_configurator(ydb_cluster_configuration, domain_login_only, ydb_flavour_path):
+    config_generator = KikimrConfigGenerator(binary_paths=[ydb_flavour_path], **ydb_cluster_configuration)
     config_generator.yaml_config['auth_config'] = {
         'domain_login_only': domain_login_only,
     }

ydb/tests/functional/tenants/ya.make

@@ -19,6 +19,8 @@ TEST_SRCS(
 
 SPLIT_FACTOR(20)
 
+INCLUDE(${ARCADIA_ROOT}/ydb/tests/library/flavours/flavours_deps.inc)
+
 DEPENDS(
     ydb/apps/ydbd
 )
@@ -27,6 +29,7 @@ PEERDIR(
     contrib/python/requests
     ydb/tests/library
     ydb/tests/library/fixtures
+    ydb/tests/library/flavours
     ydb/tests/library/clients
     ydb/tests/oss/ydb_sdk_import
     ydb/public/sdk/python

ydb/tests/library/flavours/__init__.py

@@ -0,0 +1,24 @@
+import os
+
+import yatest
+import pytest
+
+FLAVOUR_TO_PATH = {}
+
+_PREFIX = "YDB_FLAVOUR_"
+
+for key, value in os.environ.items():
+    if key.startswith(_PREFIX):
+        new_key = key[len(_PREFIX):]
+        FLAVOUR_TO_PATH[new_key] = value
+
+if not FLAVOUR_TO_PATH:
+    raise RuntimeError("Flavours not found. Did you forget to include 'tests/library/flavours/flavours_deps.inc' in ya.make?")
+
+
+@pytest.fixture(scope='module', params=FLAVOUR_TO_PATH.values(), ids=FLAVOUR_TO_PATH.keys())
+def ydb_flavour_path(request):
+    """
+    This fixture is a way to test different ydb flavours in one parametrized test
+    """
+    return yatest.common.binary_path(request.param)

ydb/tests/library/flavours/flavours_deps.inc

@@ -0,0 +1,9 @@
+DEPENDS(
+    ydb/apps/ydbd
+)
+
+ENV(YDB_FLAVOUR_YDB="ydb/apps/ydbd/ydbd")
+
+IF (NOT OPENSOURCE)
+    INCLUDE(${ARCADIA_ROOT}/kikimr/tests/flavours/flavours_deps.inc)
+ENDIF()

ydb/tests/library/flavours/ya.make

@@ -0,0 +1,7 @@
+PY3_LIBRARY()
+
+PY_SRCS(
+    __init__.py
+)
+
+END()

ydb/tests/library/harness/kikimr_config.py

@@ -259,6 +259,16 @@ def __init__(
             self.yaml_config["local_pg_wire_config"] = {}
             self.yaml_config["local_pg_wire_config"]["listening_port"] = os.getenv('PGWIRE_LISTENING_PORT')
 
+        # dirty hack for internal ydbd flavour
+        if "cert" in self.get_binary_path(0):
+            # Hardcoded feature flags. Should be hardcoded in binary itself
+            self.yaml_config["feature_flags"]["enable_strict_acl_check"] = True
+            self.yaml_config["feature_flags"]["enable_strict_user_management"] = True
+            self.yaml_config["feature_flags"]["enable_database_admin"] = True
+            self.yaml_config["feature_flags"]["database_yaml_config_allowed"] = True
+            self.yaml_config["feature_flags"]["enable_resource_pools"] = False
+            self.yaml_config["feature_flags"]["check_database_access_permission"] = True
+
         self.yaml_config["feature_flags"]["enable_public_api_external_blobs"] = enable_public_api_external_blobs
 
         # for faster shutdown: there is no reason to wait while tablets are drained before whole cluster is stopping

ydb/tests/library/ut/ya.make

@@ -1,5 +1,11 @@
 PY3TEST()
 
+ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
+
+DEPENDS(
+    ydb/apps/ydbd
+)
+
 PEERDIR(
     ydb/tests/library
     yql/essentials/providers/common/proto

ydb/tests/library/ya.make

@@ -107,6 +107,7 @@ END()
 RECURSE(
     compatibility
     clients
+    flavours
     serializability
     test_meta
     wardens