From 56f259e8ec83ea13d3ad07e67f9d47e59090474b Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Thu, 30 Apr 2026 16:02:34 -0700
Subject: [PATCH] Fix environment selection CI test harness

Use the shared test PathBufExt import for RMCP integration tests and run environment selection tests that touch the local executor under Tokio.

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/core/src/environment_selection.rs | 8 ++++----
 codex-rs/core/tests/suite/rmcp_client.rs   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/codex-rs/core/src/environment_selection.rs b/codex-rs/core/src/environment_selection.rs
index 823b17a3a9..9d11e044c1 100644
--- a/codex-rs/core/src/environment_selection.rs
+++ b/codex-rs/core/src/environment_selection.rs
@@ -160,8 +160,8 @@ mod tests {
         assert!(err.to_string().contains("duplicate"));
     }
 
-    #[test]
-    fn resolved_environment_selections_use_first_selection_as_primary() {
+    #[tokio::test]
+    async fn resolved_environment_selections_use_first_selection_as_primary() {
         let cwd = AbsolutePathBuf::current_dir().expect("cwd");
         let selected_cwd = cwd.join("selected");
         let manager = EnvironmentManager::default_for_tests();
@@ -185,8 +185,8 @@ mod tests {
         );
     }
 
-    #[test]
-    fn resolved_environment_selections_use_fallback_without_selections() {
+    #[tokio::test]
+    async fn resolved_environment_selections_use_fallback_without_selections() {
         let cwd = AbsolutePathBuf::current_dir().expect("cwd");
         let manager = EnvironmentManager::default_for_tests();
 
diff --git a/codex-rs/core/tests/suite/rmcp_client.rs b/codex-rs/core/tests/suite/rmcp_client.rs
index e06206af6d..e6f8ee8147 100644
--- a/codex-rs/core/tests/suite/rmcp_client.rs
+++ b/codex-rs/core/tests/suite/rmcp_client.rs
@@ -46,8 +46,8 @@ use codex_protocol::protocol::McpToolCallBeginEvent;
 use codex_protocol::protocol::Op;
 use codex_protocol::protocol::TurnEnvironmentSelection;
 use codex_protocol::user_input::UserInput;
-use codex_utils_absolute_path::PathBufExt;
 use codex_utils_cargo_bin::cargo_bin;
+use core_test_support::PathBufExt;
 use core_test_support::assert_regex_match;
 use core_test_support::remote_env_env_var;
 use core_test_support::responses;