huskies: merge 954
This commit is contained in:
@@ -528,6 +528,12 @@ mod tests {
|
||||
"CONFLICT (content): server/src/lib.rs",
|
||||
crate::db::ItemMeta::named("Conflict"),
|
||||
);
|
||||
// After master c228ae16, has_content_conflict_failure reads from
|
||||
// {story_id}:gate_output (not the story description), so seed it there.
|
||||
crate::db::write_content(
|
||||
"9860_story_conflict:gate_output",
|
||||
"CONFLICT (content): server/src/lib.rs",
|
||||
);
|
||||
|
||||
let pool = AgentPool::new_test(3001);
|
||||
pool.auto_assign_available_work(tmp.path()).await;
|
||||
@@ -681,6 +687,12 @@ mod tests {
|
||||
"CONFLICT (content): foo.rs",
|
||||
crate::db::ItemMeta::named("Transient"),
|
||||
);
|
||||
// After master c228ae16, has_content_conflict_failure reads from
|
||||
// {story_id}:gate_output (not the story description), so seed it there.
|
||||
crate::db::write_content(
|
||||
"920_story_transient:gate_output",
|
||||
"CONFLICT (content): foo.rs",
|
||||
);
|
||||
// Simulate two previous transient exits (below cap of 3) recorded in DB.
|
||||
crate::db::write_content("920_story_transient:mergemaster_spawn_count", "2");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user