From d06eaed008a9dedccd4766e49ed967491c26b34d Mon Sep 17 00:00:00 2001
From: Hunter Bown <hmbown@gmail.com>
Date: Mon, 4 May 2026 01:16:44 -0500
Subject: [PATCH] fix(tests): serialize env-mutating tests with module mutex
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`resolve_api_key_source_reports_env_when_set` and
`resolve_api_key_source_prefers_config_over_env` both mutate
DEEPSEEK_API_KEY in process-global env. With cargo test's default
parallelism they race — one test reads while the other's set is still
active — causing intermittent CI failures on Linux (passes locally).

Fix: module-level `static ENV_LOCK: Mutex<()>`, both tests acquire
before touching env. `unwrap_or_else(|p| p.into_inner())` recovers
from poisoning so a panic in one test doesn't cascade.

Closes the CI failure introduced in the v0.8.9 cut (4511ea76); does
not affect runtime behavior — `Config::default()` is still empty and
`resolve_api_key_source` semantics are unchanged.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 crates/tui/src/main.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/tui/src/main.rs b/crates/tui/src/main.rs
index d4802a7b..5aaa4eb6 100644
--- a/crates/tui/src/main.rs
+++ b/crates/tui/src/main.rs
@@ -4338,6 +4338,13 @@ mod setup_helper_tests {
     use std::collections::BTreeSet;
     use tempfile::TempDir;
 
+    // Serialize tests that mutate process-global env vars. Without this,
+    // `cargo test` runs them in parallel and they race on `DEEPSEEK_API_KEY`,
+    // causing intermittent CI failures (one test reads while another's set
+    // is still active). `unwrap_or_else` recovers from poisoning so a panic
+    // in one test doesn't cascade through the whole module.
+    static ENV_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
+
     #[test]
     fn init_tools_dir_creates_readme_and_example() {
         let tmp = TempDir::new().unwrap();
@@ -4546,11 +4553,8 @@ mod setup_helper_tests {
 
     #[test]
     fn resolve_api_key_source_reports_env_when_set() {
-        // Snapshot env so we can restore it.
+        let _guard = ENV_LOCK.lock().unwrap_or_else(|p| p.into_inner());
         let prev = std::env::var("DEEPSEEK_API_KEY").ok();
-        // SAFETY: tests in this binary may run in parallel; use a marker that
-        // is unmistakably a test value so concurrent reads can detect it.
-        // To avoid clobbering CI keys we save/restore around the assertion.
         unsafe {
             std::env::set_var("DEEPSEEK_API_KEY", "test-helper-value");
         }
@@ -4565,6 +4569,7 @@ mod setup_helper_tests {
 
     #[test]
     fn resolve_api_key_source_prefers_config_over_env() {
+        let _guard = ENV_LOCK.lock().unwrap_or_else(|p| p.into_inner());
         let prev = std::env::var("DEEPSEEK_API_KEY").ok();
         unsafe {
             std::env::set_var("DEEPSEEK_API_KEY", "stale-env-key");