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
5 changes: 4 additions & 1 deletion desloppify/engine/_plan/auto_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,16 @@ def _evictable_auto_cluster_issue_ids(plan: PlanModel) -> set[str]:
active_ids: set[str] = set()
inactive_ids: set[str] = set()
for cluster in plan.get("clusters", {}).values():
if not isinstance(cluster, dict) or not cluster.get("auto"):
if not isinstance(cluster, dict):
continue
ids = {
issue_id
for issue_id in cluster.get("issue_ids", [])
if isinstance(issue_id, str) and issue_id and not is_synthetic_id(issue_id)
}
if not cluster.get("auto"):
active_ids |= ids
continue
if cluster_is_active(cluster):
active_ids |= ids
else:
Expand Down
24 changes: 24 additions & 0 deletions desloppify/tests/plan/test_queue_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,30 @@ def test_cross_cluster_move_not_evicted() -> None:
assert evicted == {"old_only"}


def test_manual_cluster_member_not_evicted_from_inactive_auto_cluster() -> None:
from desloppify.engine._plan.auto_cluster import (
_evictable_auto_cluster_issue_ids,
)

plan = {
"clusters": {
"auto/exports": {
"auto": True,
"issue_ids": ["u1", "u2"],
"execution_status": EXECUTION_STATUS_REVIEW,
"execution_policy": EXECUTION_POLICY_PLANNED_ONLY,
},
"manual/my-task": {
"auto": False,
"issue_ids": ["u1"],
"execution_status": EXECUTION_STATUS_ACTIVE,
},
},
}
evicted = _evictable_auto_cluster_issue_ids(plan)
assert evicted == {"u2"}


# ── explain_queue ──────────────────────────────────────────────────


Expand Down