From 8f23d13ac89fdb5440c716e1288b9fc5c70ce62b Mon Sep 17 00:00:00 2001 From: dave Date: Tue, 28 Apr 2026 13:42:56 +0000 Subject: [PATCH] huskies: merge 779 --- .../pool/pipeline/advance/tests_regression.rs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/server/src/agents/pool/pipeline/advance/tests_regression.rs b/server/src/agents/pool/pipeline/advance/tests_regression.rs index 564f30fa..0eefd928 100644 --- a/server/src/agents/pool/pipeline/advance/tests_regression.rs +++ b/server/src/agents/pool/pipeline/advance/tests_regression.rs @@ -11,7 +11,6 @@ use crate::io::watcher::WatcherEvent; /// reset to master before mergemaster ran. #[tokio::test] async fn mergemaster_blocks_and_sends_story_blocked_when_no_commits_ahead() { - use std::fs; use std::process::Command; let tmp = tempfile::tempdir().unwrap(); @@ -47,15 +46,6 @@ async fn mergemaster_blocks_and_sends_story_blocked_when_no_commits_ahead() { .output() .unwrap(); - // Set up pipeline dirs and story file. - let current = root.join(".huskies/work/2_current"); - fs::create_dir_all(¤t).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::write_item_with_content( "9919_story_no_commits", @@ -220,7 +210,6 @@ stage = "qa" /// no-op — no post-merge tests, no notifications, no agent restarts. #[tokio::test] async fn stale_mergemaster_advance_for_done_story_is_noop() { - use std::fs; use std::process::Command; // Initialise CRDT so read_typed works. @@ -252,9 +241,6 @@ async fn stale_mergemaster_advance_for_done_story_is_noop() { .output() .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. let story_id = "9929_story_zombie_merge"; let content = "---\nname: Zombie Merge Test\n---\n";