clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: flaky test 6 (#8175)

Browse Source
This commit is contained in:
jif-oai
2025-12-17 11:59:13 +00:00
committed by GitHub
parent 813bdb9010
commit 2bf57674d6
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codex-rs/core/tests/suite/tool_parallelism.rs
View File

@@ -398,8 +398,8 @@ async fn shell_tools_start_before_response_completed_when_stream_delayed() -> an
for timestamp in timestamps {
assert!(
timestamp < completed_at,
"timestamp {timestamp} should be before completed {completed_at}"
timestamp <= completed_at,
"timestamp {timestamp} should be before or equal to completed {completed_at}"
);
}

29
codex-rs/core/tests/suite/unified_exec.rs
View File

@@ -232,7 +232,6 @@ async fn unified_exec_intercepts_apply_patch_exec_command() -> Result<()> {
false
}
EventMsg::ExecCommandBegin(event) if event.call_id == call_id => {
println!("Saw it");
saw_exec_begin = true;
false
}
@@ -689,9 +688,10 @@ async fn unified_exec_full_lifecycle_with_background_end_event() -> Result<()> {
} = builder.build(&server).await?;
let call_id = "uexec-full-lifecycle";
// This timing force the long-standing PTY
let args = json!({
"cmd": "printf 'HELLO-FULL-LIFECYCLE'",
"yield_time_ms": 250,
"cmd": "sleep 0.5; printf 'HELLO-FULL-LIFECYCLE'",
"yield_time_ms": 1000,
});
let responses = vec![
@@ -727,26 +727,28 @@ async fn unified_exec_full_lifecycle_with_background_end_event() -> Result<()> {
let mut begin_event = None;
let mut end_event = None;
let mut saw_delta_with_marker = 0;
let mut task_completed = false;
loop {
let msg = wait_for_event(&codex, |_| true).await;
match msg {
EventMsg::ExecCommandBegin(ev) if ev.call_id == call_id => begin_event = Some(ev),
EventMsg::ExecCommandOutputDelta(ev) if ev.call_id == call_id => {
let text = String::from_utf8_lossy(&ev.chunk);
if text.contains("HELLO-FULL-LIFECYCLE") {
saw_delta_with_marker += 1;
}
}
EventMsg::ExecCommandEnd(ev) if ev.call_id == call_id => {
assert!(
end_event.is_none(),
"expected a single ExecCommandEnd event for this call id"
);
end_event = Some(ev);
if task_completed && end_event.is_some() {
break;
}
}
EventMsg::TaskComplete(_) => {
task_completed = true;
if task_completed && end_event.is_some() {
break;
}
}
EventMsg::TaskComplete(_) => break,
_ => {}
}
}
@@ -758,11 +760,6 @@ async fn unified_exec_full_lifecycle_with_background_end_event() -> Result<()> {
"begin event should include a process_id for a long-lived session"
);
assert_eq!(
saw_delta_with_marker, 0,
"no ExecCommandOutputDelta should be sent for early exit commands"
);
let end_event = end_event.expect("expected ExecCommandEnd event");
assert_eq!(end_event.call_id, call_id);
assert_eq!(end_event.exit_code, 0);