Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Deduplicate zsh fork test setup (#39790)

jif43526b85613e
diff --git a/codex-rs/core/tests/common/zsh_fork.rs b/codex-rs/core/tests/common/zsh_fork.rs
index 0a0fb14d85..225867d8c7 100644
--- a/codex-rs/core/tests/common/zsh_fork.rs
+++ b/codex-rs/core/tests/common/zsh_fork.rs
@@ -89,27 +89,6 @@ where
builder.build(server).await
}
-pub async fn build_unified_exec_zsh_fork_test<F>(
- server: &wiremock::MockServer,
- runtime: ZshForkRuntime,
- approval_policy: AskForApproval,
- permission_profile: PermissionProfile,
- pre_build_hook: F,
-) -> Result<TestCodex>
-where
- F: FnOnce(&Path) + Send + 'static,
-{
- let mut builder = zsh_fork_test_builder(runtime, approval_policy)
- .with_pre_build_hook(pre_build_hook)
- .with_config(move |config| {
- config
- .permissions
- .set_permission_profile(permission_profile)
- .expect("set permission profile");
- });
- builder.build(server).await
-}
-
pub fn zsh_fork_test_builder(
runtime: ZshForkRuntime,
approval_policy: AskForApproval,
diff --git a/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rs b/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rs
index fd23f006bf..218e228093 100644
--- a/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rs
+++ b/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rs
@@ -40,7 +40,7 @@ use core_test_support::test_codex::local_selections;
use core_test_support::test_codex::turn_permission_fields;
use core_test_support::wait_for_event;
use core_test_support::wait_for_event_with_timeout;
-use core_test_support::zsh_fork::build_unified_exec_zsh_fork_test;
+use core_test_support::zsh_fork::build_zsh_fork_test;
use core_test_support::zsh_fork::restrictive_workspace_write_profile;
use core_test_support::zsh_fork::zsh_fork_runtime;
use pretty_assertions::assert_eq;
@@ -619,7 +619,7 @@ where
};
let server = start_mock_server().await;
- let test = build_unified_exec_zsh_fork_test(
+ let test = build_zsh_fork_test(
&server,
runtime,
approval_policy,