25-1: sysview make database admin tests stable (#15466)

Make tests on database admin access to auth_* sysviews stable.

Author: ijon

ydb/tests/functional/tenants/test_auth_system_views.py

@@ -88,20 +88,27 @@ def stream_query_result(driver, query):
     return result, error
 
 
-@pytest.fixture(scope='function')
-def prepared_test_env(ydb_cluster, ydb_root, ydb_database, ydb_client):
+@pytest.fixture(scope='module')
+def prepared_root_db(ydb_cluster, ydb_root, ydb_endpoint):
     cluster_admin = ydb.AuthTokenCredentials(ydb_cluster.config.default_clusteradmin)
 
     # prepare root database
-    with ydb_client(ydb_root, credentials=cluster_admin) as driver:
+    driver_config = ydb.DriverConfig(ydb_endpoint, ydb_root, credentials=cluster_admin)
+    with ydb.Driver(driver_config) as driver:
         pool = ydb.SessionPool(driver)
         with pool.checkout() as session:
             session.execute_scheme("create user clusteradmin password '1234'")
             session.execute_scheme("create user clusteruser password '1234'")
 
+
+@pytest.fixture(scope='module')
+def prepared_tenant_db(ydb_cluster, ydb_endpoint, ydb_database_module_scope):
+    cluster_admin = ydb.AuthTokenCredentials(ydb_cluster.config.default_clusteradmin)
+
     # prepare tenant database
-    database_path = ydb_database
-    with ydb_client(database_path, credentials=cluster_admin) as driver:
+    database_path = ydb_database_module_scope
+    driver_config = ydb.DriverConfig(ydb_endpoint, database_path, credentials=cluster_admin)
+    with ydb.Driver(driver_config) as driver:
         pool = ydb.SessionPool(driver)
         with pool.checkout() as session:
             # add users
@@ -139,8 +146,8 @@ def login_user(endpoint, database, user, password):
     ('dbadmin', True),
     ('ordinaryuser', False)
 ])
-def test_tenant_auth_groups_access(ydb_endpoint, ydb_root, prepared_test_env, ydb_client, user, expected_access):
-    tenant_database = prepared_test_env
+def test_tenant_auth_groups_access(ydb_endpoint, ydb_root, prepared_root_db, prepared_tenant_db, ydb_client, user, expected_access):
+    tenant_database = prepared_tenant_db
 
     # user could be either from the root or tenant database,
     # but they must obtain auth token by logging in the database they live in

ydb/tests/library/harness/ydb_fixtures.py

@@ -105,15 +105,33 @@ def ydb_database_ctx(ydb_cluster, database_path, node_count=1, timeout_seconds=2
     logger.debug("destroy database %s: database down", database_path)
 
 
-@pytest.fixture(scope='function')
-def ydb_database(ydb_cluster, ydb_root, ydb_safe_test_name):
-    database = os.path.join(ydb_root, ydb_safe_test_name)
+def _ydb_database(cluster, database_path_base, unique_name):
+    database = os.path.join(database_path_base, unique_name)
 
-    with ydb_database_ctx(ydb_cluster, database):
+    with ydb_database_ctx(cluster, database):
         yield database
 
 
 @pytest.fixture(scope='function')
+def ydb_database(ydb_cluster, ydb_root, ydb_safe_test_name):
+    # FIXME: PY2 syntax compatibility quirk: "yield from" emulation
+    # Can't use py3 syntax here cause there are nasty dependencies on
+    # tests/library/harness from some py2-only code in some other repositories
+    for i in _ydb_database(ydb_cluster, ydb_root, ydb_safe_test_name):
+        yield i
+
+
+@pytest.fixture(scope='module')
+def ydb_database_module_scope(ydb_cluster, ydb_root, request):
+    # make unique database name from the test module name, ensuring that
+    # it does not contains the dots
+    unique_name = request.module.__name__.split('.')[-1]
+    # FIXME: PY2 syntax compatibility quirk: "yield from" emulation
+    for i in _ydb_database(ydb_cluster, ydb_root, unique_name):
+        yield i
+
+
+@pytest.fixture(scope='module')
 def ydb_endpoint(ydb_cluster):
     return "%s:%s" % (ydb_cluster.nodes[1].host, ydb_cluster.nodes[1].port)