Merge 25e9684795 into sapling-pr-archive-bolinfest

This commit is contained in:
Michael Bolin
2025-05-19 16:02:45 -07:00
committed by GitHub
3 changed files with 7 additions and 6 deletions
+3 -3
View File
@@ -98,7 +98,7 @@ async fn live_streaming_and_prev_id_reset() {
match ev.msg {
EventMsg::AgentMessage(_) => saw_message_before_complete = true,
EventMsg::TaskComplete => break,
EventMsg::TaskComplete(_) => break,
EventMsg::Error(ErrorEvent { message }) => {
panic!("agent reported error in task1: {message}")
}
@@ -136,7 +136,7 @@ async fn live_streaming_and_prev_id_reset() {
{
got_expected = true;
}
EventMsg::TaskComplete => break,
EventMsg::TaskComplete(_) => break,
EventMsg::Error(ErrorEvent { message }) => {
panic!("agent reported error in task2: {message}")
}
@@ -204,7 +204,7 @@ async fn live_shell_function_call() {
assert!(stdout.contains(MARKER));
saw_end_with_output = true;
}
EventMsg::TaskComplete => break,
EventMsg::TaskComplete(_) => break,
EventMsg::Error(codex_core::protocol::ErrorEvent { message }) => {
panic!("agent error during shell test: {message}")
}
+2 -2
View File
@@ -132,7 +132,7 @@ async fn keeps_previous_response_id_between_tasks() {
.await
.unwrap()
.unwrap();
if matches!(ev.msg, EventMsg::TaskComplete) {
if matches!(ev.msg, EventMsg::TaskComplete(_)) {
break;
}
}
@@ -154,7 +154,7 @@ async fn keeps_previous_response_id_between_tasks() {
.unwrap()
.unwrap();
match ev.msg {
EventMsg::TaskComplete => break,
EventMsg::TaskComplete(_) => break,
EventMsg::Error(ErrorEvent { message }) => {
panic!("unexpected error: {message}")
}
+2 -1
View File
@@ -6,6 +6,7 @@ use std::time::Duration;
use codex_core::Codex;
use codex_core::ModelProviderInfo;
use codex_core::exec::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR;
use codex_core::protocol::EventMsg;
use codex_core::protocol::InputItem;
use codex_core::protocol::Op;
mod test_support;
@@ -118,7 +119,7 @@ async fn retries_on_early_close() {
.await
.unwrap()
.unwrap();
if matches!(ev.msg, codex_core::protocol::EventMsg::TaskComplete) {
if matches!(ev.msg, EventMsg::TaskComplete(_)) {
break;
}
}