Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions desloppify/app/commands/plan/cluster/update_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,11 @@ def _apply_cluster_metadata(
if bad:
print(services.colorize_fn(f" Unknown cluster(s): {', '.join(bad)}", "red"))
return False
cluster["depends_on_clusters"] = request.depends_on
print(services.colorize_fn(f" Dependencies set: {', '.join(request.depends_on)}", "dim"))
dependencies = list(
dict.fromkeys([*cluster.get("depends_on_clusters", []), *request.depends_on])
)
cluster["depends_on_clusters"] = dependencies
print(services.colorize_fn(f" Dependencies set: {', '.join(dependencies)}", "dim"))
return True


Expand Down
46 changes: 46 additions & 0 deletions desloppify/tests/commands/plan/test_triage_tooling_fixes.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,52 @@ def test_depends_on_persisted(monkeypatch, capsys, tmp_path: Path) -> None:
assert test_plan["clusters"]["cluster-b"]["depends_on_clusters"] == ["cluster-a"]


def test_depends_on_repeated_updates_append(monkeypatch) -> None:
"""Repeated --depends-on updates should preserve existing dependencies."""
from desloppify.app.commands.plan.cluster import dispatch as cluster_handlers

test_plan = {
"clusters": {
"cluster-a": {"issue_ids": [], "action_steps": []},
"cluster-b": {"issue_ids": [], "action_steps": []},
"cluster-c": {"issue_ids": [], "action_steps": []},
},
"queue_order": [],
"execution_log": [],
}
monkeypatch.setattr(cluster_update_mod, "load_plan", lambda: test_plan)
monkeypatch.setattr(cluster_update_mod, "save_plan", lambda _plan: None)
monkeypatch.setattr(cluster_update_mod, "append_log_entry", lambda *_args, **_kwargs: None)

def update(*dependencies: str) -> None:
args = argparse.Namespace(
cluster_name="cluster-c",
description=None,
steps=None,
steps_file=None,
add_step=None,
detail=None,
update_step=None,
remove_step=None,
done_step=None,
undone_step=None,
priority=None,
effort=None,
depends_on=list(dependencies),
issue_refs=None,
state=None,
)
cluster_handlers._cmd_cluster_update(args)

update("cluster-a")
update("cluster-b")

assert test_plan["clusters"]["cluster-c"]["depends_on_clusters"] == [
"cluster-a",
"cluster-b",
]


def test_depends_on_invalid_cluster(monkeypatch, capsys) -> None:
"""--depends-on with invalid cluster name should error."""
from desloppify.app.commands.plan.cluster import dispatch as cluster_handlers
Expand Down