From cdd5fb86069e6fab0c1fca4b82755e2d98fd236e Mon Sep 17 00:00:00 2001 From: Abhinav Vedmala Date: Mon, 8 Jun 2026 16:27:05 -0700 Subject: [PATCH] Simplify Windows sandbox regression test --- codex-rs/core/src/tools/runtimes/mod.rs | 14 ++++---- codex-rs/core/tests/suite/windows_sandbox.rs | 34 +------------------- 2 files changed, 8 insertions(+), 40 deletions(-) diff --git a/codex-rs/core/src/tools/runtimes/mod.rs b/codex-rs/core/src/tools/runtimes/mod.rs index 034ec9ab59..308d567beb 100644 --- a/codex-rs/core/src/tools/runtimes/mod.rs +++ b/codex-rs/core/src/tools/runtimes/mod.rs @@ -447,7 +447,7 @@ mod disable_powershell_profile_tests { Some(&ShellType::PowerShell), SandboxType::WindowsRestrictedToken, WindowsSandboxLevel::Elevated, - /* proxy_enforced */ false, + /*proxy_enforced*/ false, ); assert_eq!( @@ -474,7 +474,7 @@ mod disable_powershell_profile_tests { Some(&ShellType::PowerShell), SandboxType::WindowsRestrictedToken, WindowsSandboxLevel::Elevated, - /* proxy_enforced */ false, + /*proxy_enforced*/ false, ); assert_eq!( @@ -502,7 +502,7 @@ mod disable_powershell_profile_tests { Some(&ShellType::PowerShell), SandboxType::WindowsRestrictedToken, WindowsSandboxLevel::Elevated, - /* proxy_enforced */ false, + /*proxy_enforced*/ false, ); assert_eq!(rewritten, command); @@ -521,7 +521,7 @@ mod disable_powershell_profile_tests { Some(&ShellType::PowerShell), SandboxType::WindowsRestrictedToken, WindowsSandboxLevel::RestrictedToken, - /* proxy_enforced */ true, + /*proxy_enforced*/ true, ); assert_eq!( @@ -548,7 +548,7 @@ mod disable_powershell_profile_tests { Some(&ShellType::PowerShell), SandboxType::WindowsRestrictedToken, WindowsSandboxLevel::RestrictedToken, - /* proxy_enforced */ false, + /*proxy_enforced*/ false, ); assert_eq!(rewritten, command); @@ -567,7 +567,7 @@ mod disable_powershell_profile_tests { Some(&ShellType::PowerShell), SandboxType::None, WindowsSandboxLevel::Elevated, - /* proxy_enforced */ false, + /*proxy_enforced*/ false, ); assert_eq!(rewritten, command); @@ -586,7 +586,7 @@ mod disable_powershell_profile_tests { Some(&ShellType::Bash), SandboxType::WindowsRestrictedToken, WindowsSandboxLevel::Elevated, - /* proxy_enforced */ false, + /*proxy_enforced*/ false, ); assert_eq!(rewritten, command); diff --git a/codex-rs/core/tests/suite/windows_sandbox.rs b/codex-rs/core/tests/suite/windows_sandbox.rs index 10956b8009..4f9048cea8 100644 --- a/codex-rs/core/tests/suite/windows_sandbox.rs +++ b/codex-rs/core/tests/suite/windows_sandbox.rs @@ -16,10 +16,7 @@ use codex_protocol::permissions::FileSystemSandboxEntry; use codex_protocol::permissions::FileSystemSandboxPolicy; use codex_protocol::permissions::FileSystemSpecialPath; use codex_protocol::permissions::NetworkSandboxPolicy; -use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::Op; -use codex_protocol::user_input::UserInput; use core_test_support::PathExt; use core_test_support::managed_network_requirements_loader; use core_test_support::responses::ev_assistant_message; @@ -30,7 +27,6 @@ use core_test_support::responses::mount_sse_sequence; use core_test_support::responses::sse; use core_test_support::responses::start_mock_server; use core_test_support::test_codex::test_codex; -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 pretty_assertions::assert_eq; @@ -427,35 +423,7 @@ async fn windows_unified_exec_managed_network_enforces_deny_read() -> anyhow::Re ) .await; - let session_model = test.session_configured.model.clone(); - let (sandbox_policy, permission_profile) = - turn_permission_fields(permission_profile, test.config.cwd.as_path()); - test.codex - .submit(Op::UserInput { - items: vec![UserInput::Text { - text: "read the fixture files".into(), - text_elements: Vec::new(), - }], - environments: None, - final_output_json_schema: None, - responsesapi_client_metadata: None, - additional_context: Default::default(), - thread_settings: codex_protocol::protocol::ThreadSettingsOverrides { - cwd: Some(test.config.cwd.clone()), - approval_policy: Some(AskForApproval::Never), - sandbox_policy: Some(sandbox_policy), - permission_profile, - collaboration_mode: Some(codex_protocol::config_types::CollaborationMode { - mode: codex_protocol::config_types::ModeKind::Default, - settings: codex_protocol::config_types::Settings { - model: session_model, - reasoning_effort: None, - developer_instructions: None, - }, - }), - ..Default::default() - }, - }) + test.submit_turn_with_permission_profile("read the fixture files", permission_profile) .await?; let output = wait_for_event_with_timeout(