The agent harness performance optimization system. Skills, instincts, memory, security, and research-first development for Claude Code, Codex, Opencode, Cursor and beyond.
stabilize ecc2 cwd-mutating tests
Affaan Mustafa6b8a49a6eed1
diff --git a/ecc2/src/main.rs b/ecc2/src/main.rsindex df844a963..17fe57be9 100644--- a/ecc2/src/main.rs+++ b/ecc2/src/main.rs@@ -6,6 +6,45 @@ mod session;mod tui;mod worktree;+#[cfg(test)]+pub(crate) mod test_support {+ use anyhow::{Context, Result};+ use std::path::{Path, PathBuf};+ use std::sync::{Mutex, MutexGuard, OnceLock};++ static CURRENT_DIR_LOCK: OnceLock<Mutex<()>> = OnceLock::new();++ pub(crate) struct CurrentDirGuard {+ _lock: MutexGuard<'static, ()>,+ original_dir: PathBuf,+ }++ impl CurrentDirGuard {+ pub(crate) fn enter(target_dir: &Path) -> Result<Self> {+ let lock = CURRENT_DIR_LOCK+ .get_or_init(|| Mutex::new(()))+ .lock()+ .expect("current-dir test lock poisoned");+ let original_dir =+ std::env::current_dir().context("Failed to capture current test directory")?;+ std::env::set_current_dir(target_dir).with_context(|| {+ format!("Failed to enter test directory {}", target_dir.display())+ })?;++ Ok(Self {+ _lock: lock,+ original_dir,+ })+ }+ }++ impl Drop for CurrentDirGuard {+ fn drop(&mut self) {+ let _ = std::env::set_current_dir(&self.original_dir);+ }+ }+}+use anyhow::{Context, Result};use clap::Parser;use serde::{Deserialize, Serialize};@@ -10828,14 +10867,7 @@ mod tests {let tempdb = TestDir::new("legacy-schedule-import-live-db")?;let db = StateStore::open(&tempdb.path().join("state.db"))?;- struct CurrentDirGuard(PathBuf);- impl Drop for CurrentDirGuard {- fn drop(&mut self) {- let _ = std::env::set_current_dir(&self.0);- }- }- let _cwd_guard = CurrentDirGuard(std::env::current_dir()?);- std::env::set_current_dir(&target_repo)?;+ let _cwd_guard = crate::test_support::CurrentDirGuard::enter(&target_repo)?;let report = import_legacy_schedules(&db, &config::Config::default(), root, false)?;assert!(!report.dry_run);@@ -11038,14 +11070,7 @@ Route existing installs to portal first before checkout.let tempdb = TestDir::new("legacy-remote-import-live-db")?;let db = StateStore::open(&tempdb.path().join("state.db"))?;- struct CurrentDirGuard(PathBuf);- impl Drop for CurrentDirGuard {- fn drop(&mut self) {- let _ = std::env::set_current_dir(&self.0);- }- }- let _cwd_guard = CurrentDirGuard(std::env::current_dir()?);- std::env::set_current_dir(&target_repo)?;+ let _cwd_guard = crate::test_support::CurrentDirGuard::enter(&target_repo)?;let report = import_legacy_remote_dispatch(&db, &Config::default(), root, false)?;diff --git a/ecc2/src/tui/dashboard.rs b/ecc2/src/tui/dashboard.rsindex ead20f895..396f3402d 100644--- a/ecc2/src/tui/dashboard.rs+++ b/ecc2/src/tui/dashboard.rs@@ -12923,8 +12923,7 @@ diff --git a/src/lib.rs b/src/lib.rslet repo_root = tempdir.join("repo");init_git_repo(&repo_root)?;- let original_dir = std::env::current_dir()?;- std::env::set_current_dir(&repo_root)?;+ let cwd_guard = crate::test_support::CurrentDirGuard::enter(&repo_root)?;let mut cfg = build_config(&tempdir);cfg.orchestration_templates = BTreeMap::from([(@@ -13000,7 +12999,7 @@ diff --git a/src/lib.rs b/src/lib.rs]));- std::env::set_current_dir(original_dir)?;+ drop(cwd_guard);let _ = std::fs::remove_dir_all(&tempdir);Ok(())}