From 3ad47058d479dc5f42528faec91ea200cfc96d6b Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Tue, 7 Apr 2026 02:07:53 -0700 Subject: [PATCH] codex: harden wait-agent shutdown test (#16599) --- codex-rs/core/src/tools/handlers/multi_agents_tests.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs index bcb47f3b6b..e83303b96e 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs @@ -2473,14 +2473,12 @@ async fn wait_agent_returns_final_status_without_timeout() { .await .expect("subscribe should succeed"); - let _ = thread + thread .thread - .submit(Op::Shutdown {}) + .shutdown_and_wait() .await - .expect("shutdown should submit"); - let _ = timeout(Duration::from_secs(1), status_rx.changed()) - .await - .expect("shutdown status should arrive"); + .expect("shutdown should complete"); + assert_eq!(status_rx.borrow_and_update().clone(), AgentStatus::Shutdown); let invocation = invocation( Arc::new(session),