Skip to content

fix: hold mcp-suite test env locks until env guards drop #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ScriptedAlchemy merged 1 commit into from
Jul 2, 2026
Merged

fix: hold mcp-suite test env locks until env guards drop #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions tests/mcp_suite/mcp_handler_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,13 @@ fn test_temp_dir() -> TestTempDir {

struct TestProject {
dir: Option<TestTempDir>,
_env_lock: MutexGuard<'static, ()>,
_home_guard: HomeEnvGuard,
_global_db_guard: GlobalDbEnvGuard,
// Field order is load-bearing: fields drop in declaration order, so the
// env lock must be declared last. Releasing it before the guards restore
// `HOME` / the global DB override would let the next waiting test install
// its own env, only for these guards to clobber it.
_env_lock: MutexGuard<'static, ()>,
}

impl std::ops::Deref for TestProject {
Expand All @@ -273,15 +277,19 @@ impl Drop for TestProject {
}

struct TestEnv {
_env_lock: MutexGuard<'static, ()>,
_home_guard: HomeEnvGuard,
_global_db_guard: GlobalDbEnvGuard,
// Drop order = declaration order: the env lock must outlive the guards
// above so their env restores happen while the lock is still held.
_env_lock: MutexGuard<'static, ()>,
}

struct CrossProjectMemoryEnv {
_dir: TestTempDir,
_env_lock: MutexGuard<'static, ()>,
_storage_guard: common::TraceDecayStorageEnvGuard,
// Drop order = declaration order: the env lock must outlive the storage
// guard above so its env restore happens while the lock is still held.
_env_lock: MutexGuard<'static, ()>,
}

struct TestTraceDecay {
Expand Down
Loading