huskies: merge 958

2026-05-13 11:47:27 +00:00
parent 8b53e20ca9
commit 28338a8e8d
7 changed files with 103 additions and 31 deletions
@@ -643,10 +643,9 @@ mod tests {
            "stage should be Stage::Merge after unblock, got: {:?}",
            item.stage
        );
-        // auto_assign checks is_active() — Merge satisfies it.
        assert!(
-            item.stage.is_active(),
-            "Merge satisfies is_active() so auto_assign can pick it up: {:?}",
+            matches!(item.stage, Stage::Merge { .. }),
+            "stage should be Stage::Merge so auto_assign can pick it up: {:?}",
            item.stage
        );
    }