Replace experiment fixture with the standard one (#168)

There is no `make_experiment` fixture. The original test created a
folder and then in multiple threads created experiment artifacts in that
folder (plus the post-test cleanup). Is this todo?

---------

Co-authored-by: Serge Smertin <[email protected]>
Co-authored-by: Serge Smertin <[email protected]>

Author: larsgeorge-db

src/databricks/labs/ucx/providers/mixins/fixtures.py

@@ -415,6 +415,29 @@ def create(
     yield from factory("cluster", create, lambda item: ws.clusters.permanent_delete(item.cluster_id))
 
 
+@pytest.fixture
+def make_experiment(ws, make_random):
+    def create(
+        *,
+        path: str | None = None,
+        experiment_name: str | None = None,
+        **kwargs,
+    ):
+        if path is None:
+            path = f"/Users/{ws.current_user.me().user_name}/{make_random(4)}"
+        if experiment_name is None:
+            experiment_name = f"sdk-{make_random(4)}"
+
+        try:
+            ws.workspace.mkdirs(path)
+        except DatabricksError:
+            pass
+
+        return ws.experiments.create_experiment(name=f"{path}/{experiment_name}", **kwargs)
+
+    yield from factory("experiment", create, lambda item: ws.experiments.delete_experiment(item.experiment_id))
+
+
 @pytest.fixture
 def make_instance_pool(ws, make_random):
     def create(*, instance_pool_name=None, node_type_id=None, **kwargs):

tests/integration/conftest.py

@@ -8,10 +8,10 @@
 import databricks.sdk.core
 import pytest
 from databricks.sdk import AccountClient, WorkspaceClient
-from databricks.sdk.core import Config, DatabricksError
+from databricks.sdk.core import Config
 from databricks.sdk.service.compute import CreatePolicyResponse
 from databricks.sdk.service.iam import AccessControlRequest, PermissionLevel
-from databricks.sdk.service.ml import CreateExperimentResponse, ModelDatabricks
+from databricks.sdk.service.ml import ModelDatabricks
 from databricks.sdk.service.ml import PermissionLevel as ModelPermissionLevel
 from databricks.sdk.service.workspace import ObjectInfo, ObjectType
 
@@ -36,7 +36,6 @@
 NUM_TEST_GROUPS = int(os.environ.get("NUM_TEST_GROUPS", 5))
 NUM_TEST_INSTANCE_PROFILES = int(os.environ.get("NUM_TEST_INSTANCE_PROFILES", 3))
 NUM_TEST_CLUSTER_POLICIES = int(os.environ.get("NUM_TEST_CLUSTER_POLICIES", 3))
-NUM_TEST_EXPERIMENTS = int(os.environ.get("NUM_TEST_EXPERIMENTS", 3))
 NUM_TEST_MODELS = int(os.environ.get("NUM_TEST_MODELS", 3))
 NUM_TEST_TOKENS = int(os.environ.get("NUM_TEST_TOKENS", 3))
 
@@ -281,39 +280,6 @@ def cluster_policies(env: EnvironmentInfo, ws: WorkspaceClient) -> list[CreatePo
     Threader(executables).run()
 
 
-@pytest.fixture
-def experiments(ws: WorkspaceClient, env: EnvironmentInfo) -> list[CreateExperimentResponse]:
-    logger.debug("Creating test experiments")
-
-    try:
-        ws.workspace.mkdirs("/experiments")
-    except DatabricksError:
-        pass
-
-    test_experiments = Threader(
-        [
-            partial(ws.experiments.create_experiment, name=f"/experiments/{env.test_uid}-test-{i}")
-            for i in range(NUM_TEST_EXPERIMENTS)
-        ]
-    ).run()
-
-    _set_random_permissions(
-        test_experiments,
-        "experiment_id",
-        RequestObjectType.EXPERIMENTS,
-        env,
-        ws,
-        permission_levels=[PermissionLevel.CAN_MANAGE, PermissionLevel.CAN_READ, PermissionLevel.CAN_EDIT],
-    )
-
-    yield test_experiments
-
-    logger.debug("Deleting test experiments")
-    executables = [partial(ws.experiments.delete_experiment, e.experiment_id) for e in test_experiments]
-    Threader(executables).run()
-    logger.debug("Test experiments deleted")
-
-
 @pytest.fixture
 def models(ws: WorkspaceClient, env: EnvironmentInfo) -> list[ModelDatabricks]:
     logger.debug("Creating models")
@@ -423,7 +389,6 @@ def workspace_objects(ws: WorkspaceClient, env: EnvironmentInfo) -> WorkspaceObj
 @pytest.fixture
 def verifiable_objects(
     cluster_policies,
-    experiments,
     models,
     tokens,
     workspace_objects,
@@ -432,7 +397,6 @@ def verifiable_objects(
         (workspace_objects, "workspace_objects", None),
         (tokens, "tokens", RequestObjectType.AUTHORIZATION),
         (cluster_policies, "policy_id", RequestObjectType.CLUSTER_POLICIES),
-        (experiments, "experiment_id", RequestObjectType.EXPERIMENTS),
         (models, "id", RequestObjectType.REGISTERED_MODELS),
     ]
     yield _verifiable_objects

tests/integration/test_e2e.py

@@ -134,6 +134,8 @@ def test_e2e(
     make_instance_pool_permissions,
     make_cluster,
     make_cluster_permissions,
+    make_experiment,
+    make_experiment_permissions,
     make_job,
     make_job_permissions,
     make_pipeline,
@@ -166,6 +168,18 @@ def test_e2e(
         ([cluster], "cluster_id", RequestObjectType.CLUSTERS),
     )
 
+    experiment = make_experiment()
+    make_experiment_permissions(
+        object_id=experiment.experiment_id,
+        permission_level=random.choice(
+            [PermissionLevel.CAN_MANAGE, PermissionLevel.CAN_READ, PermissionLevel.CAN_EDIT]
+        ),
+        group_name=ws_group.display_name,
+    )
+    verifiable_objects.append(
+        ([experiment], "experiment_id", RequestObjectType.EXPERIMENTS),
+    )
+
     job = make_job()
     make_job_permissions(
         object_id=job.job_id,