huskies: merge 1009

server/src/io/watcher/mod.rs

@@ -54,7 +54,7 @@ pub fn stage_metadata(
     match stage {
         Stage::Upcoming => ("create", format!("huskies: triage {item_id}")),
         Stage::Backlog => ("create", format!("huskies: create {item_id}")),
-        Stage::Coding => ("start", format!("huskies: start {item_id}")),
+        Stage::Coding { .. } => ("start", format!("huskies: start {item_id}")),
         Stage::Blocked { .. } => ("block", format!("huskies: block {item_id}")),
         Stage::Qa => ("qa", format!("huskies: queue {item_id} for QA")),
         Stage::Merge { .. } => ("merge", format!("huskies: queue {item_id} for merge")),

server/src/io/watcher/tests.rs

@@ -54,7 +54,7 @@ fn stage_metadata_returns_correct_actions() {
     use crate::pipeline_state::{GitSha, Stage};
     use chrono::Utc;
 
-    let (action, msg) = stage_metadata(&Stage::Coding, "42_story_foo");
+    let (action, msg) = stage_metadata(&Stage::Coding { claim: None }, "42_story_foo");
     assert_eq!(action, "start");
     assert_eq!(msg, "huskies: start 42_story_foo");
 
@@ -177,8 +177,6 @@ fn sweep_uses_crdt_merged_at_not_utc_now() {
         None,
         None,
         None,
-        None,
-        None,
         Some(ten_seconds_ago),
     );
 
@@ -209,8 +207,6 @@ fn sweep_keeps_item_newer_than_retention() {
         None,
         None,
         None,
-        None,
-        None,
         Some(one_second_ago),
     );