openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-09 15:58:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: fix PR CI for fs sandbox tests (#16747)

Browse Source
This commit is contained in:
starr-openai
2026-04-03 21:29:16 -07:00
parent b85bee8cba
commit 29069c17a6
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
codex-rs/app-server/BUILD.bazel
View File

@@ -3,6 +3,7 @@ load("//:defs.bzl", "codex_rust_crate")
codex_rust_crate(
name = "app-server",
crate_name = "codex_app_server",
extra_binaries = ["//codex-rs/exec-server:codex-exec-server"],
integration_test_timeout = "long",
test_tags = ["no-sandbox"],
)

20
codex-rs/app-server/tests/suite/v2/fs.rs
View File

@@ -20,8 +20,8 @@ use codex_utils_cargo_bin::cargo_bin;
use pretty_assertions::assert_eq;
use serde_json::json;
use std::path::PathBuf;
use std::sync::Mutex;
use tempfile::TempDir;
use tokio::sync::Mutex;
use tokio::time::Duration;
use tokio::time::timeout;
use uuid::Uuid;
@@ -33,7 +33,7 @@ use std::os::unix::fs::symlink;
use std::process::Command;
const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(10);
static EXEC_SERVER_SELF_EXE_ENV_LOCK: Mutex<()> = Mutex::new(());
static EXEC_SERVER_SELF_EXE_ENV_LOCK: Mutex<()> = Mutex::const_new(());
struct SandboxHelperEnvGuard {
previous_exec_server_self_exe: Option<std::ffi::OsString>,
@@ -43,12 +43,14 @@ struct SandboxHelperEnvGuard {
impl SandboxHelperEnvGuard {
fn install() -> Result<Self> {
let exec_server_binary = cargo_bin("codex-exec-server")?;
let linux_sandbox_binary = cargo_bin("codex-linux-sandbox")?;
let linux_sandbox_binary = cargo_bin("codex-linux-sandbox").ok();
let previous_exec_server_self_exe = std::env::var_os("CODEX_EXEC_SERVER_SELF_EXE");
let previous_linux_sandbox_exe = std::env::var_os("CODEX_LINUX_SANDBOX_EXE");
unsafe {
std::env::set_var("CODEX_EXEC_SERVER_SELF_EXE", &exec_server_binary);
std::env::set_var("CODEX_LINUX_SANDBOX_EXE", &linux_sandbox_binary);
if let Some(linux_sandbox_binary) = linux_sandbox_binary.as_ref() {
std::env::set_var("CODEX_LINUX_SANDBOX_EXE", linux_sandbox_binary);
}
}
Ok(Self {
previous_exec_server_self_exe,
@@ -370,9 +372,7 @@ async fn fs_write_file_accepts_base64_bytes() -> Result<()> {
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn fs_methods_support_sandbox_policy() -> Result<()> {
let _lock = EXEC_SERVER_SELF_EXE_ENV_LOCK
.lock()
.expect("lock exec-server path env");
let _lock = EXEC_SERVER_SELF_EXE_ENV_LOCK.lock().await;
let _env_guard = SandboxHelperEnvGuard::install()?;
let codex_home = TempDir::new()?;
@@ -380,7 +380,7 @@ async fn fs_methods_support_sandbox_policy() -> Result<()> {
let copied_path = codex_home.path().join("sandboxed-copy.txt");
let policy = unrestricted_sandbox_policy();
let result = async {
async {
let mut mcp = initialized_mcp(&codex_home).await?;
let write_request_id = mcp
.send_fs_write_file_request(FsWriteFileParams {
@@ -435,9 +435,7 @@ async fn fs_methods_support_sandbox_policy() -> Result<()> {
Ok::<(), anyhow::Error>(())
}
.await;
result
.await
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]

14
codex-rs/exec-server/tests/file_system.rs
View File

@@ -5,7 +5,6 @@ mod common;
use std::os::unix::fs::symlink;
use std::process::Command;
use std::sync::Arc;
use std::sync::Mutex;
use anyhow::Context;
use anyhow::Result;
@@ -21,11 +20,12 @@ use codex_utils_cargo_bin::cargo_bin;
use pretty_assertions::assert_eq;
use tempfile::TempDir;
use test_case::test_case;
use tokio::sync::Mutex;
use common::exec_server::ExecServerHarness;
use common::exec_server::exec_server;
static SANDBOX_HELPER_ENV_LOCK: Mutex<()> = Mutex::new(());
static SANDBOX_HELPER_ENV_LOCK: Mutex<()> = Mutex::const_new(());
struct SandboxHelperEnvGuard {
previous_exec_server_self_exe: Option<std::ffi::OsString>,
@@ -35,12 +35,14 @@ struct SandboxHelperEnvGuard {
impl SandboxHelperEnvGuard {
fn install() -> Result<Self> {
let exec_server_binary = cargo_bin("codex-exec-server")?;
let linux_sandbox_binary = cargo_bin("codex-linux-sandbox")?;
let linux_sandbox_binary = cargo_bin("codex-linux-sandbox").ok();
let previous_exec_server_self_exe = std::env::var_os("CODEX_EXEC_SERVER_SELF_EXE");
let previous_linux_sandbox_exe = std::env::var_os("CODEX_LINUX_SANDBOX_EXE");
unsafe {
std::env::set_var("CODEX_EXEC_SERVER_SELF_EXE", &exec_server_binary);
std::env::set_var("CODEX_LINUX_SANDBOX_EXE", &linux_sandbox_binary);
if let Some(linux_sandbox_binary) = linux_sandbox_binary.as_ref() {
std::env::set_var("CODEX_LINUX_SANDBOX_EXE", linux_sandbox_binary);
}
}
Ok(Self {
previous_exec_server_self_exe,
@@ -416,9 +418,7 @@ async fn file_system_copy_rejects_standalone_fifo_source(use_remote: bool) -> Re
#[test_case(true ; "remote")]
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn file_system_methods_support_sandbox_policy_helper(use_remote: bool) -> Result<()> {
let _lock = SANDBOX_HELPER_ENV_LOCK
.lock()
.expect("lock sandbox helper env");
let _lock = SANDBOX_HELPER_ENV_LOCK.lock().await;
let _env_guard = SandboxHelperEnvGuard::install()?;
let context = create_file_system_context(use_remote).await?;