huskies: merge 988

2026-05-13 17:24:18 +00:00
parent a078d3df7c
commit caed894db9
15 changed files with 169 additions and 81 deletions
@@ -679,7 +679,19 @@ mod tests {
            "blocked",
            "should be in blocked after transition_to_blocked"
        );
-        assert!(item.stage.is_blocked(), "is_blocked() should return true");
+        assert!(
+            matches!(
+                item.stage,
+                Stage::Blocked { .. }
+                    | Stage::MergeFailure { .. }
+                    | Stage::MergeFailureFinal { .. }
+                    | Stage::Archived {
+                        reason: ArchiveReason::Blocked { .. },
+                        ..
+                    }
+            ),
+            "stage should be a blocked variant"
+        );
        assert!(
            matches!(item.stage, Stage::Blocked { .. }),
            "stage should be Stage::Blocked variant"