crashlabs/huskies
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

huskies: merge 779

Browse Source
This commit is contained in:
dave
2026-04-28 13:42:56 +00:00
parent aed29b952c
commit 8f23d13ac8
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/agents/pool/pipeline/advance/tests_regression.rs
-14
View File
@@ -11,7 +11,6 @@ use crate::io::watcher::WatcherEvent;
/// reset to master before mergemaster ran. /// reset to master before mergemaster ran.
#[tokio::test] #[tokio::test]
async fn mergemaster_blocks_and_sends_story_blocked_when_no_commits_ahead() { async fn mergemaster_blocks_and_sends_story_blocked_when_no_commits_ahead() {
use std::fs;
use std::process::Command; use std::process::Command;
let tmp = tempfile::tempdir().unwrap(); let tmp = tempfile::tempdir().unwrap();
@@ -47,15 +46,6 @@ async fn mergemaster_blocks_and_sends_story_blocked_when_no_commits_ahead() {
.output() .output()
.unwrap(); .unwrap();
// Set up pipeline dirs and story file.
let current = root.join(".huskies/work/2_current");
fs::create_dir_all(&current).unwrap();
fs::create_dir_all(root.join(".huskies/work/4_merge")).unwrap();
fs::write(
current.join("9919_story_no_commits.md"),
"---\nname: Test\n---\n",
)
.unwrap();
crate::db::ensure_content_store(); crate::db::ensure_content_store();
crate::db::write_item_with_content( crate::db::write_item_with_content(
"9919_story_no_commits", "9919_story_no_commits",
@@ -220,7 +210,6 @@ stage = "qa"
/// no-op — no post-merge tests, no notifications, no agent restarts. /// no-op — no post-merge tests, no notifications, no agent restarts.
#[tokio::test] #[tokio::test]
async fn stale_mergemaster_advance_for_done_story_is_noop() { async fn stale_mergemaster_advance_for_done_story_is_noop() {
use std::fs;
use std::process::Command; use std::process::Command;
// Initialise CRDT so read_typed works. // Initialise CRDT so read_typed works.
@@ -252,9 +241,6 @@ async fn stale_mergemaster_advance_for_done_story_is_noop() {
.output() .output()
.unwrap(); .unwrap();
// Set up pipeline dirs.
fs::create_dir_all(root.join(".huskies/work/5_done")).unwrap();
// Seed the story in 5_done via the DB, which also writes to the CRDT. // Seed the story in 5_done via the DB, which also writes to the CRDT.
let story_id = "9929_story_zombie_merge"; let story_id = "9929_story_zombie_merge";
let content = "---\nname: Zombie Merge Test\n---\n"; let content = "---\nname: Zombie Merge Test\n---\n";