clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-03 10:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into codex/viyatb/0118-bwrap-regression

Browse Source 
# Conflicts:
#	codex-rs/linux-sandbox/tests/suite/landlock.rs
This commit is contained in:
viyatb-oai
2026-04-10 08:44:40 -07:00
parent f45dabf46e 88165e179a
commit ec5a7fd714
620 changed files with 32053 additions and 9030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
codex-rs/linux-sandbox/tests/suite/landlock.rs
View File

@@ -174,7 +174,7 @@ async fn run_cmd_result_with_policies_in_cwd(
timeout_ms: u64,
use_legacy_landlock: bool,
) -> Result<codex_protocol::exec_output::ExecToolCallOutput> {
let cwd = cwd.to_path_buf();
let cwd = AbsolutePathBuf::from_absolute_path(cwd).expect("cwd should be absolute");
let sandbox_cwd = cwd.clone();
let params = ExecParams {
command: cmd.iter().copied().map(str::to_owned).collect(),
@@ -315,7 +315,7 @@ async fn bwrap_populates_minimal_dev_nodes() {
}
#[tokio::test]
async fn bwrap_dev_nodes_work_when_workspace_dot_codex_is_missing() {
async fn bwrap_dev_nodes_work_and_missing_workspace_dot_codex_stays_blocked() {
if should_skip_bwrap_tests().await {
eprintln!("skipping bwrap test: bwrap sandbox prerequisites are unavailable");
return;
@@ -327,7 +327,11 @@ async fn bwrap_dev_nodes_work_when_workspace_dot_codex_is_missing() {
&[
"bash",
"-lc",
": >/dev/null && head -c 8 /dev/zero | od -An -tx1",
concat!(
": >/dev/null && ",
"if mkdir .codex 2>/dev/null; then exit 42; fi && ",
"head -c 8 /dev/zero | od -An -tx1"
),
],
&writable_roots,
tmpdir.path(),
@@ -343,10 +347,6 @@ async fn bwrap_dev_nodes_work_when_workspace_dot_codex_is_missing() {
output.stdout.text.split_whitespace().collect::<Vec<_>>(),
vec!["00", "00", "00", "00", "00", "00", "00", "00"]
);
assert!(
!tmpdir.path().join(".codex").exists(),
"missing workspace .codex should not be materialized by bwrap startup"
);
}
#[tokio::test]
@@ -466,7 +466,7 @@ async fn test_timeout() {
/// suite remains green on leaner CI images.
#[expect(clippy::expect_used)]
async fn assert_network_blocked(cmd: &[&str]) {
let cwd = std::env::current_dir().expect("cwd should exist");
let cwd = AbsolutePathBuf::current_dir().expect("cwd should exist");
let sandbox_cwd = cwd.clone();
let params = ExecParams {
command: cmd.iter().copied().map(str::to_owned).collect(),