From 36e346da33b286b2ca106f38540d18ccd7ec322e Mon Sep 17 00:00:00 2001 From: starr-openai Date: Fri, 8 May 2026 17:47:43 -0700 Subject: [PATCH] Give remote integration waits more CI headroom Keep the assertions intact while allowing rollback and remote tool-output events longer to arrive under the remote full-ci load. Co-authored-by: Codex --- codex-rs/core/tests/suite/compact_resume_fork.rs | 2 +- codex-rs/core/tests/suite/model_switching.rs | 2 +- codex-rs/core/tests/suite/remote_env.rs | 2 +- codex-rs/core/tests/suite/view_image.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codex-rs/core/tests/suite/compact_resume_fork.rs b/codex-rs/core/tests/suite/compact_resume_fork.rs index b707e3e3ca..0611085736 100644 --- a/codex-rs/core/tests/suite/compact_resume_fork.rs +++ b/codex-rs/core/tests/suite/compact_resume_fork.rs @@ -46,7 +46,7 @@ use wiremock::MockServer; const AFTER_SECOND_RESUME: &str = "AFTER_SECOND_RESUME"; const AFTER_ROLLBACK: &str = "AFTER_ROLLBACK"; -const THREAD_ROLLBACK_EVENT_TIMEOUT: Duration = Duration::from_secs(25); +const THREAD_ROLLBACK_EVENT_TIMEOUT: Duration = Duration::from_secs(60); fn network_disabled() -> bool { std::env::var(CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR).is_ok() diff --git a/codex-rs/core/tests/suite/model_switching.rs b/codex-rs/core/tests/suite/model_switching.rs index 305162e90c..a6a6251d0d 100644 --- a/codex-rs/core/tests/suite/model_switching.rs +++ b/codex-rs/core/tests/suite/model_switching.rs @@ -41,7 +41,7 @@ use std::path::PathBuf; use tokio::time::Duration; use wiremock::MockServer; -const THREAD_ROLLBACK_EVENT_TIMEOUT: Duration = Duration::from_secs(25); +const THREAD_ROLLBACK_EVENT_TIMEOUT: Duration = Duration::from_secs(60); fn read_only_user_turn(test: &TestCodex, items: Vec, model: String) -> Op { let (sandbox_policy, permission_profile) = diff --git a/codex-rs/core/tests/suite/remote_env.rs b/codex-rs/core/tests/suite/remote_env.rs index cb8e0761ca..9b8ad68bbf 100644 --- a/codex-rs/core/tests/suite/remote_env.rs +++ b/codex-rs/core/tests/suite/remote_env.rs @@ -44,7 +44,7 @@ async fn wait_for_function_call_output( response_mock: &core_test_support::responses::ResponseMock, call_id: &str, ) -> Result { - tokio::time::timeout(Duration::from_secs(25), async { + tokio::time::timeout(Duration::from_secs(60), async { loop { if let Some(output) = response_mock.function_call_output_text(call_id) { return output; diff --git a/codex-rs/core/tests/suite/view_image.rs b/codex-rs/core/tests/suite/view_image.rs index 07e383d1a3..222f8fab76 100644 --- a/codex-rs/core/tests/suite/view_image.rs +++ b/codex-rs/core/tests/suite/view_image.rs @@ -68,7 +68,7 @@ async fn wait_for_function_call_output( response_mock: &responses::ResponseMock, call_id: &str, ) -> anyhow::Result { - tokio::time::timeout(Duration::from_secs(25), async { + tokio::time::timeout(Duration::from_secs(60), async { loop { if let Some(output) = response_mock.function_call_output(call_id) { return output;