huskies: merge 1010
This commit is contained in:
@@ -100,6 +100,7 @@ mod tests {
|
||||
.single()
|
||||
.unwrap(),
|
||||
}),
|
||||
plan: Default::default(),
|
||||
},
|
||||
Some("Stale Claim Displacement Test"),
|
||||
None,
|
||||
@@ -111,7 +112,7 @@ mod tests {
|
||||
// Confirm the stale claim is in place.
|
||||
let before = read_item(story_id).expect("item should exist");
|
||||
let before_claim = match before.stage() {
|
||||
Stage::Coding { claim } => claim.as_ref(),
|
||||
Stage::Coding { claim, .. } => claim.as_ref(),
|
||||
Stage::Merge { claim, .. } => claim.as_ref(),
|
||||
_ => None,
|
||||
};
|
||||
@@ -150,7 +151,7 @@ mod tests {
|
||||
let our_id = our_node_id().expect("node id should be available after init_for_test");
|
||||
let after = read_item(story_id).expect("item should still exist");
|
||||
let after_claim = match after.stage() {
|
||||
Stage::Coding { claim } => claim.as_ref(),
|
||||
Stage::Coding { claim, .. } => claim.as_ref(),
|
||||
Stage::Merge { claim, .. } => claim.as_ref(),
|
||||
_ => None,
|
||||
};
|
||||
|
||||
@@ -66,7 +66,7 @@ pub(super) async fn scan_and_claim(
|
||||
}
|
||||
|
||||
let item_claim = match item.stage() {
|
||||
crate::pipeline_state::Stage::Coding { claim } => claim.as_ref(),
|
||||
crate::pipeline_state::Stage::Coding { claim, .. } => claim.as_ref(),
|
||||
crate::pipeline_state::Stage::Merge { claim, .. } => claim.as_ref(),
|
||||
_ => None,
|
||||
};
|
||||
@@ -196,7 +196,7 @@ pub(super) fn reclaim_timed_out_work(_project_root: &Path) {
|
||||
// holder is still alive. A node actively working should refresh its
|
||||
// claim before the TTL window closes.
|
||||
let reclaim_claim = match item.stage() {
|
||||
crate::pipeline_state::Stage::Coding { claim } => claim.as_ref(),
|
||||
crate::pipeline_state::Stage::Coding { claim, .. } => claim.as_ref(),
|
||||
crate::pipeline_state::Stage::Merge { claim, .. } => claim.as_ref(),
|
||||
_ => None,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user