Deduplicate zsh fork test setup (#39790)

## What changed

Reuse the shared `build_zsh_fork_test` helper in the unified exec approval
suite and remove its identical suite-specific wrapper.

GitOrigin-RevId: 0593f0e1a56737eba1d491872a44d14e9171dbfb
This commit is contained in:
jif
2026-08-20 19:28:54 +00:00
committed by copyberry
parent 9e680a52e7
commit 43526b8561
2 changed files with 2 additions and 23 deletions

View File

@@ -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,

View File

@@ -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,