From a49e6d6feb22ff3646c236359d35dedcc866e3fa Mon Sep 17 00:00:00 2001
From: Ray Morgan <raymorgan@openai.com>
Date: Wed, 10 Jun 2026 02:07:07 -0700
Subject: [PATCH] codex: stabilize Guardian compaction recovery test

---
 codex-rs/core/src/guardian/tests.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/codex-rs/core/src/guardian/tests.rs b/codex-rs/core/src/guardian/tests.rs
index 5bba919e52..c98c78348e 100644
--- a/codex-rs/core/src/guardian/tests.rs
+++ b/codex-rs/core/src/guardian/tests.rs
@@ -2277,6 +2277,11 @@ async fn guardian_recovers_from_eager_compaction_failure_and_timeout() -> anyhow
         .await
         .expect("discarded guardian rollout path");
     let committed_rollout = tokio::fs::read(&discarded_rollout_path).await?;
+    tokio::time::timeout(
+        EAGER_COMPACTION_TEST_TIMEOUT,
+        server.wait_for_request_count(/*count*/ 2),
+    )
+    .await?;
     failed_compaction_tx
         .send(())
         .expect("failed compaction response gate should still be open");