Replace jobs test with fixture based one. (#167)

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

Author: larsgeorge-db

tests/integration/conftest.py

@@ -11,7 +11,6 @@
 from databricks.sdk.core import Config, DatabricksError
 from databricks.sdk.service.compute import CreatePolicyResponse
 from databricks.sdk.service.iam import AccessControlRequest, PermissionLevel
-from databricks.sdk.service.jobs import CreateResponse
 from databricks.sdk.service.ml import CreateExperimentResponse, ModelDatabricks
 from databricks.sdk.service.ml import PermissionLevel as ModelPermissionLevel
 from databricks.sdk.service.sql import (
@@ -30,8 +29,6 @@
     EnvironmentInfo,
     InstanceProfile,
     WorkspaceObjects,
-    _get_basic_job_cluster,
-    _get_basic_task,
     _set_random_permissions,
 )
 
@@ -43,7 +40,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_JOBS = int(os.environ.get("NUM_TEST_JOBS", 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_WAREHOUSES = int(os.environ.get("NUM_TEST_WAREHOUSES", 3))
@@ -255,33 +251,6 @@ def instance_profiles(env: EnvironmentInfo, ws: WorkspaceClient) -> list[Instanc
     logger.debug("Test instance profiles deleted")
 
 
-@pytest.fixture
-def jobs(env: EnvironmentInfo, ws: WorkspaceClient) -> list[CreateResponse]:
-    logger.debug("Creating test jobs")
-
-    test_jobs: list[CreateResponse] = [
-        ws.jobs.create(
-            name=f"{env.test_uid}-test-{i}", job_clusters=[_get_basic_job_cluster()], tasks=[_get_basic_task()]
-        )
-        for i in range(NUM_TEST_JOBS)
-    ]
-
-    _set_random_permissions(
-        test_jobs,
-        "job_id",
-        RequestObjectType.JOBS,
-        env,
-        ws,
-        permission_levels=[PermissionLevel.CAN_VIEW, PermissionLevel.CAN_MANAGE_RUN, PermissionLevel.CAN_MANAGE],
-    )
-
-    yield test_jobs
-
-    logger.debug("Deleting test jobs")
-    executables = [partial(ws.jobs.delete, j.job_id) for j in test_jobs]
-    Threader(executables).run()
-
-
 @pytest.fixture
 def cluster_policies(env: EnvironmentInfo, ws: WorkspaceClient) -> list[CreatePolicyResponse]:
     logger.debug("Creating test cluster policies")
@@ -494,7 +463,6 @@ def workspace_objects(ws: WorkspaceClient, env: EnvironmentInfo) -> WorkspaceObj
 @pytest.fixture
 def verifiable_objects(
     cluster_policies,
-    jobs,
     experiments,
     models,
     warehouses,
@@ -505,7 +473,6 @@ def verifiable_objects(
         (workspace_objects, "workspace_objects", None),
         (tokens, "tokens", RequestObjectType.AUTHORIZATION),
         (cluster_policies, "policy_id", RequestObjectType.CLUSTER_POLICIES),
-        (jobs, "job_id", RequestObjectType.JOBS),
         (experiments, "experiment_id", RequestObjectType.EXPERIMENTS),
         (models, "id", RequestObjectType.REGISTERED_MODELS),
         (warehouses, "id", RequestObjectType.SQL_WAREHOUSES),

tests/integration/test_e2e.py

@@ -134,6 +134,8 @@ def test_e2e(
     make_instance_pool_permissions,
     make_cluster,
     make_cluster_permissions,
+    make_job,
+    make_job_permissions,
     make_pipeline,
     make_pipeline_permissions,
     make_secret_scope,
@@ -162,6 +164,18 @@ def test_e2e(
         ([cluster], "cluster_id", RequestObjectType.CLUSTERS),
     )
 
+    job = make_job()
+    make_job_permissions(
+        object_id=job.job_id,
+        permission_level=random.choice(
+            [PermissionLevel.CAN_VIEW, PermissionLevel.CAN_MANAGE_RUN, PermissionLevel.CAN_MANAGE]
+        ),
+        group_name=ws_group.display_name,
+    )
+    verifiable_objects.append(
+        ([job], "job_id", RequestObjectType.JOBS),
+    )
+
     pipeline = make_pipeline()
     make_pipeline_permissions(
         object_id=pipeline.pipeline_id,