From 508c91c2c25a78ce1251e42f6f367dea00b2f0b5 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Tue, 31 Mar 2026 08:45:00 -0600
Subject: [PATCH] Stabilize approval tests under Bazel

---
 codex-rs/core/tests/common/lib.rs        |  7 ++++++-
 codex-rs/core/tests/common/test_codex.rs | 14 ++++++++++++++
 codex-rs/core/tests/suite/approvals.rs   |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/codex-rs/core/tests/common/lib.rs b/codex-rs/core/tests/common/lib.rs
index c6b52b946c..c7fa69a54f 100644
--- a/codex-rs/core/tests/common/lib.rs
+++ b/codex-rs/core/tests/common/lib.rs
@@ -3,6 +3,7 @@
 use anyhow::Context as _;
 use anyhow::ensure;
 use codex_arg0::Arg0PathEntryGuard;
+use codex_protocol::config_types::ApprovalsReviewer;
 use codex_utils_cargo_bin::CargoBinError;
 use ctor::ctor;
 use std::sync::OnceLock;
@@ -199,6 +200,7 @@ pub async fn load_default_config_for_test(codex_home: &TempDir) -> Config {
 #[cfg(target_os = "linux")]
 fn default_test_overrides() -> ConfigOverrides {
     ConfigOverrides {
+        approvals_reviewer: Some(ApprovalsReviewer::User),
         codex_linux_sandbox_exe: Some(
             find_codex_linux_sandbox_exe().expect("should find binary for codex-linux-sandbox"),
         ),
@@ -208,7 +210,10 @@ fn default_test_overrides() -> ConfigOverrides {
 
 #[cfg(not(target_os = "linux"))]
 fn default_test_overrides() -> ConfigOverrides {
-    ConfigOverrides::default()
+    ConfigOverrides {
+        approvals_reviewer: Some(ApprovalsReviewer::User),
+        ..ConfigOverrides::default()
+    }
 }
 
 #[cfg(target_os = "linux")]
diff --git a/codex-rs/core/tests/common/test_codex.rs b/codex-rs/core/tests/common/test_codex.rs
index 0fa820bd5a..73d53a447d 100644
--- a/codex-rs/core/tests/common/test_codex.rs
+++ b/codex-rs/core/tests/common/test_codex.rs
@@ -973,6 +973,7 @@ mod tests {
     use codex_core::config_loader::NetworkRequirementsToml;
     use codex_core::config_loader::RequirementSource;
     use codex_core::config_loader::Sourced;
+    use codex_protocol::config_types::ApprovalsReviewer;
     use pretty_assertions::assert_eq;
     use serde_json::json;
 
@@ -1085,4 +1086,17 @@ mod tests {
             ))
         );
     }
+
+    #[tokio::test]
+    async fn prepare_config_defaults_to_manual_approvals_reviewer() {
+        let home = TempDir::new().expect("create home");
+        let mut builder = test_codex();
+
+        let (config, _) = builder
+            .prepare_config("http://example.test".to_string(), &home)
+            .await
+            .expect("prepare config");
+
+        assert_eq!(config.approvals_reviewer, ApprovalsReviewer::User);
+    }
 }
diff --git a/codex-rs/core/tests/suite/approvals.rs b/codex-rs/core/tests/suite/approvals.rs
index f7874eaf45..da05f9458c 100644
--- a/codex-rs/core/tests/suite/approvals.rs
+++ b/codex-rs/core/tests/suite/approvals.rs
@@ -229,7 +229,7 @@ impl ActionKind {
                 let event = shell_event(
                     call_id,
                     &command,
-                    /*timeout_ms*/ 5_000,
+                    /*timeout_ms*/ 15_000,
                     sandbox_permissions,
                 )?;
                 Ok((event, Some(command)))