Skip to content

fix: deflake zsh-fork approval test #25669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jif-oai merged 2 commits into from
Jun 1, 2026
Merged

fix: deflake zsh-fork approval test #25669

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15200a3
fix: flake test
jif-oai Jun 1, 2026
a0ee76a
Merge branch 'main' into jif/fix-flake
jif-oai Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions codex-rs/app-server/tests/suite/v2/turn_start_zsh_fork.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,12 +535,11 @@ async fn turn_start_shell_zsh_fork_subcommand_decline_marks_parent_declined_v2()
}],
cwd: Some(workspace.clone()),
approval_policy: Some(codex_app_server_protocol::AskForApproval::UnlessTrusted),
sandbox_policy: Some(codex_app_server_protocol::SandboxPolicy::WorkspaceWrite {
writable_roots: vec![workspace.clone().try_into()?],
network_access: false,
exclude_tmpdir_env_var: true,
exclude_slash_tmp: true,
}),
// This test is about execve-intercept approval propagation, not
// workspace sandboxing. Using full access avoids macOS sandbox
// setup failures that can terminate the parent shell before the
// second subcommand approval is observed.
sandbox_policy: Some(codex_app_server_protocol::SandboxPolicy::DangerFullAccess),
model: Some("mock-model".to_string()),
effort: Some(codex_protocol::openai_models::ReasoningEffort::Medium),
summary: Some(codex_protocol::config_types::ReasoningSummary::Auto),
Expand Down
Loading