Skip to content

Commit d26916b

Browse files
committed
Do not expect cluster in sequence steps when not found
1 parent 1ea02f7 commit d26916b

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

tests/integration/assessment/test_sequencing.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from databricks.sdk.service import jobs
22

3+
from databricks.labs.ucx.source_code.graph import DependencyProblem
4+
35

46
def test_migration_sequencing_simple_job(make_job, runtime_ctx) -> None:
57
"""Sequence a simple job"""
@@ -43,9 +45,15 @@ def test_migration_sequencing_job_with_task_referencing_non_existing_cluster(run
4345
settings = jobs.JobSettings(name="test-job", tasks=[task])
4446
job = jobs.Job(job_id=1234, settings=settings)
4547

46-
maybe_job_node = runtime_ctx.migration_sequencer.register_job(job)
47-
assert maybe_job_node.failed
48+
maybe_node = runtime_ctx.migration_sequencer.register_job(job)
49+
assert maybe_node.failed
50+
assert maybe_node.problems == [
51+
DependencyProblem(
52+
code="cluster-not-found",
53+
message="Could not find cluster: non-existing-id",
54+
)
55+
]
4856

4957
steps = runtime_ctx.migration_sequencer.generate_steps()
5058
step_object_types = [step.object_type for step in steps]
51-
assert step_object_types == ["CLUSTER", "TASK", "JOB"] # TODO: What do we expect?
59+
assert step_object_types == ["TASK", "JOB"]

tests/unit/assessment/test_sequencing.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,8 @@ def test_sequence_steps_from_job_task_with_non_existing_cluster(ws, admin_locato
284284
"""Sequence a job with a task that references a non-existing cluster.
285285
286286
Sequence:
287-
1. Cluster # TODO: Do we still expect this reference?
288-
2. Task
289-
3. Job
287+
1. Task
288+
2. Job
290289
"""
291290
ws.clusters.get.side_effect = ResourceDoesNotExist("Unknown cluster")
292291
task = jobs.Task(task_key="test-task", existing_cluster_id="non-existing-id")
@@ -298,23 +297,14 @@ def test_sequence_steps_from_job_task_with_non_existing_cluster(ws, admin_locato
298297
steps = list(sequencer.generate_steps())
299298

300299
assert steps == [
301-
MigrationStep(
302-
step_id=2,
303-
step_number=0,
304-
object_type="CLUSTER",
305-
object_id="non-existing-id",
306-
object_name="non-existing-id",
307-
object_owner="John Doe",
308-
required_step_ids=[],
309-
),
310300
MigrationStep(
311301
step_id=1,
312302
step_number=0,
313303
object_type="TASK",
314304
object_id="1234/test-task",
315305
object_name="test-task",
316306
object_owner="John Doe",
317-
required_step_ids=[2],
307+
required_step_ids=[],
318308
),
319309
MigrationStep(
320310
step_id=0,

0 commit comments

Comments
 (0)