vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

hive-bash-mcp: share one HARNESS_DIR_ENV_LOCK across test modules

Browse source
This commit is contained in:
damocles 2026-08-10 23:35:52 +02:00
commit 4fd25b7f45
4 changed files with 54 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

31
hive-bash-mcp/src/mcp.rs
View file

@ -289,36 +289,7 @@ pub async fn serve_http(addr: std::net::SocketAddr) -> anyhow::Result<()> {
mod status_hint_tests {
use super::{BASH_IDLE_WAIT_HINT, format_task};
use crate::protocol::{TaskFile, TaskStatus};
use std::sync::Mutex;
/// `format_task` unconditionally resolves `crate::paths::task_out`/
/// `task_err` (to check captured-output length), which panics if
/// `HYPERHIVE_HARNESS_DIR` is unset — exactly cargo's sandboxed test
/// environment. Same helper shape as `runner::tests::with_harness_dir`
/// (module-scope mutex to serialise against parallel test threads
/// mutating the process-wide env var, save/restore on the way out);
/// duplicated rather than shared because the two test modules live in
/// separate files with no existing shared test-util module.
static HARNESS_DIR_ENV_LOCK: Mutex<()> = Mutex::new(());
fn with_harness_dir<F: FnOnce()>(f: F) {
let _guard = HARNESS_DIR_ENV_LOCK
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
let prev = std::env::var("HYPERHIVE_HARNESS_DIR").ok();
// SAFETY: serialised by HARNESS_DIR_ENV_LOCK above; restored below
// in the same scope before the guard drops.
unsafe {
std::env::set_var("HYPERHIVE_HARNESS_DIR", "/tmp/hive-bash-mcp-test-harness");
}
f();
unsafe {
match prev {
Some(v) => std::env::set_var("HYPERHIVE_HARNESS_DIR", v),
None => std::env::remove_var("HYPERHIVE_HARNESS_DIR"),
}
}
}
use crate::test_util::with_harness_dir;
fn task(status: TaskStatus) -> TaskFile {
TaskFile {