From 6d62ce6be2e22f569a9a166cc95311728b5cdcbc Mon Sep 17 00:00:00 2001 From: Roy Han Date: Thu, 26 Mar 2026 11:12:06 -0700 Subject: [PATCH] use anyhow instead of expected --- codex-rs/app-server/tests/suite/v2/analytics.rs | 11 ++++++----- codex-rs/app-server/tests/suite/v2/thread_fork.rs | 2 +- codex-rs/app-server/tests/suite/v2/thread_resume.rs | 2 +- codex-rs/app-server/tests/suite/v2/thread_start.rs | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/analytics.rs b/codex-rs/app-server/tests/suite/v2/analytics.rs index b656889478..045bd136da 100644 --- a/codex-rs/app-server/tests/suite/v2/analytics.rs +++ b/codex-rs/app-server/tests/suite/v2/analytics.rs @@ -117,16 +117,17 @@ pub(crate) async fn wait_for_analytics_payload( } }) .await?; - Ok(serde_json::from_slice(&body).expect("analytics payload")) + serde_json::from_slice(&body).map_err(|err| anyhow::anyhow!("invalid analytics payload: {err}")) } -pub(crate) fn thread_initialized_event(payload: &Value) -> &Value { - payload["events"] +pub(crate) fn thread_initialized_event(payload: &Value) -> Result<&Value> { + let events = payload["events"] .as_array() - .expect("events array") + .ok_or_else(|| anyhow::anyhow!("analytics payload missing events array"))?; + events .iter() .find(|event| event["event_type"] == "codex_thread_initialized") - .expect("codex_thread_initialized event should be present") + .ok_or_else(|| anyhow::anyhow!("codex_thread_initialized event should be present")) } pub(crate) fn assert_basic_thread_initialized_event( diff --git a/codex-rs/app-server/tests/suite/v2/thread_fork.rs b/codex-rs/app-server/tests/suite/v2/thread_fork.rs index 141c7e7aed..4af7946c45 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_fork.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_fork.rs @@ -216,7 +216,7 @@ async fn thread_fork_tracks_thread_initialized_analytics() -> Result<()> { let ThreadForkResponse { thread, .. } = to_response::(fork_resp)?; let payload = wait_for_analytics_payload(&server, DEFAULT_READ_TIMEOUT).await?; - let event = thread_initialized_event(&payload); + let event = thread_initialized_event(&payload)?; assert_basic_thread_initialized_event(event, &thread.id, "forked"); Ok(()) } diff --git a/codex-rs/app-server/tests/suite/v2/thread_resume.rs b/codex-rs/app-server/tests/suite/v2/thread_resume.rs index 5092faee9d..2ac68d37fe 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_resume.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_resume.rs @@ -190,7 +190,7 @@ async fn thread_resume_tracks_thread_initialized_analytics() -> Result<()> { let ThreadResumeResponse { thread, .. } = to_response::(resume_resp)?; let payload = wait_for_analytics_payload(&server, DEFAULT_READ_TIMEOUT).await?; - let event = thread_initialized_event(&payload); + let event = thread_initialized_event(&payload)?; assert_basic_thread_initialized_event(event, &thread.id, "resumed"); Ok(()) } diff --git a/codex-rs/app-server/tests/suite/v2/thread_start.rs b/codex-rs/app-server/tests/suite/v2/thread_start.rs index 2a6c1644d6..b174e525a3 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_start.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_start.rs @@ -181,7 +181,7 @@ async fn thread_start_tracks_thread_initialized_analytics() -> Result<()> { let payload = wait_for_analytics_payload(&server, DEFAULT_READ_TIMEOUT).await?; assert_eq!(payload["events"].as_array().expect("events array").len(), 1); - let event = thread_initialized_event(&payload); + let event = thread_initialized_event(&payload)?; assert_basic_thread_initialized_event(event, &thread.id, "new"); Ok(()) }