From bdfdebcfa1deec5d5659b076b1a982015c5dc2c5 Mon Sep 17 00:00:00 2001
From: Michael Bolin <mbolin@openai.com>
Date: Thu, 8 Jan 2026 15:37:46 -0800
Subject: [PATCH] fix: increase timeout for wait_for_event() for Bazel (#8946)

This seems to be necessary to get the Bazel builds on ARM Linux to go
green on https://github.com/openai/codex/pull/8875.

I don't feel great about timeout-whack-a-mole, but we're still learning
here...
---
 codex-rs/core/tests/suite/view_image.rs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/codex-rs/core/tests/suite/view_image.rs b/codex-rs/core/tests/suite/view_image.rs
index 6c0f6dcc8..8d506dc36 100644
--- a/codex-rs/core/tests/suite/view_image.rs
+++ b/codex-rs/core/tests/suite/view_image.rs
@@ -19,11 +19,13 @@ use core_test_support::skip_if_no_network;
 use core_test_support::test_codex::TestCodex;
 use core_test_support::test_codex::test_codex;
 use core_test_support::wait_for_event;
+use core_test_support::wait_for_event_with_timeout;
 use image::GenericImageView;
 use image::ImageBuffer;
 use image::Rgba;
 use image::load_from_memory;
 use serde_json::Value;
+use tokio::time::Duration;
 
 fn find_image_message(body: &Value) -> Option<&Value> {
     body.get("input")
@@ -181,14 +183,20 @@ async fn view_image_tool_attaches_local_image() -> anyhow::Result<()> {
         .await?;
 
     let mut tool_event = None;
-    wait_for_event(&codex, |event| match event {
-        EventMsg::ViewImageToolCall(_) => {
-            tool_event = Some(event.clone());
-            false
-        }
-        EventMsg::TaskComplete(_) => true,
-        _ => false,
-    })
+    wait_for_event_with_timeout(
+        &codex,
+        |event| match event {
+            EventMsg::ViewImageToolCall(_) => {
+                tool_event = Some(event.clone());
+                false
+            }
+            EventMsg::TaskComplete(_) => true,
+            _ => false,
+        },
+        // Empirically, we have seen this run slow when run under
+        // Bazel on arm Linux.
+        Duration::from_secs(10),
+    )
     .await;
 
     let tool_event = match tool_event.expect("view image tool event emitted") {