From 08924bca0058eeaf179d2291af2c485123dbf2a2 Mon Sep 17 00:00:00 2001 From: jif Date: Wed, 15 Jul 2026 22:20:06 +0000 Subject: [PATCH] Shut down Codex threads after approval scenarios (#33441) ## What changed - Explicitly shut down and wait for each approval scenario's Codex thread. - Preserve and return the scenario verification result after shutdown, so cleanup also runs when verification returns an error. GitOrigin-RevId: 78dfbe657700a47b457ea9abd5efec4edd8f8a25 --- codex-rs/core/tests/suite/approvals.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codex-rs/core/tests/suite/approvals.rs b/codex-rs/core/tests/suite/approvals.rs index 21da8ca4442c..da822652ba94 100644 --- a/codex-rs/core/tests/suite/approvals.rs +++ b/codex-rs/core/tests/suite/approvals.rs @@ -2000,9 +2000,9 @@ async fn run_scenario(scenario: &ScenarioSpec) -> Result<()> { "approval scenario {} result: exit_code={:?} stdout={:?}", scenario.name, result.exit_code, result.stdout ); - scenario.expectation.verify(&test, &result)?; - - Ok(()) + let verification_result = scenario.expectation.verify(&test, &result); + test.codex.shutdown_and_wait().await?; + verification_result } #[tokio::test(flavor = "current_thread")]