fix: hold mcp-suite test env locks until env guards drop#198
Merged
Conversation
Same drop-order hazard flagged by the PR #178 review comment on IsolatedEnv (fixed in 822d921): TestProject, TestEnv, and CrossProjectMemoryEnv declared _env_lock before their HOME/global-DB env guards, so the lock released before the guards restored env vars, letting a waiting test's freshly installed env get clobbered.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
IsolatedEnvstruct it flagged was already fixed on master in 822d921, but the same drop-order hazard existed in three sibling fixtures.TestProject,TestEnv, andCrossProjectMemoryEnv(tests/mcp_suite/mcp_handler_test.rs) so_env_lockis declared last. Rust drops fields in declaration order, so the lock is now released only afterHomeEnvGuard/GlobalDbEnvGuard/TraceDecayStorageEnvGuardrestoreHOME,TRACEDECAY_DATA_DIR, and the global DB override — a waiting test can no longer have its freshly installed env clobbered by the previous test's guard restores.Test plan
cargo fmt --allcargo clippy --all-targets -- -D warningscargo test --test storage_suite branch_db_safety(5 passed)cargo test --test mcp_suite mcp_handler(264 passed)