From bc18824d2387050ce94b5f94a4af1adda7ce3a7a Mon Sep 17 00:00:00 2001 From: Friel Date: Fri, 27 Mar 2026 20:45:41 -0700 Subject: [PATCH] fix(core): adapt custom model tests to refreshed main Drop the removed ModelInfo field and normalize refreshed ThreadManager and UserTurn test callsites. Co-authored-by: Codex --- codex-rs/core/src/codex_tests.rs | 2 -- codex-rs/core/src/thread_manager_tests.rs | 6 ++++++ codex-rs/core/tests/suite/model_info_overrides.rs | 1 - codex-rs/core/tests/suite/remote_models.rs | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/codex-rs/core/src/codex_tests.rs b/codex-rs/core/src/codex_tests.rs index 1b034d2998..1b8e37fdd7 100644 --- a/codex-rs/core/src/codex_tests.rs +++ b/codex-rs/core/src/codex_tests.rs @@ -96,8 +96,6 @@ use core_test_support::tracing::install_test_tracing; use core_test_support::wait_for_event; use opentelemetry::trace::TraceContextExt; use opentelemetry::trace::TraceId; -use opentelemetry::trace::TracerProvider as _; -use opentelemetry_sdk::trace::SdkTracerProvider; use std::collections::HashMap; use std::path::Path; use std::time::Duration; diff --git a/codex-rs/core/src/thread_manager_tests.rs b/codex-rs/core/src/thread_manager_tests.rs index 2b1503b5c0..fac0b45ce1 100644 --- a/codex-rs/core/src/thread_manager_tests.rs +++ b/codex-rs/core/src/thread_manager_tests.rs @@ -427,6 +427,8 @@ async fn interrupted_fork_snapshot_does_not_synthesize_turn_id_for_legacy_histor &config, auth_manager.clone(), SessionSource::Exec, + config.model_catalog.clone(), + config.custom_models.clone(), CollaborationModesConfig::default(), Arc::new(codex_exec_server::EnvironmentManager::new( /*exec_server_url*/ None, @@ -527,6 +529,8 @@ async fn interrupted_fork_snapshot_preserves_explicit_turn_id() { &config, auth_manager.clone(), SessionSource::Exec, + config.model_catalog.clone(), + config.custom_models.clone(), CollaborationModesConfig::default(), Arc::new(codex_exec_server::EnvironmentManager::new( /*exec_server_url*/ None, @@ -616,6 +620,8 @@ async fn interrupted_fork_snapshot_uses_persisted_mid_turn_history_without_live_ &config, auth_manager.clone(), SessionSource::Exec, + config.model_catalog.clone(), + config.custom_models.clone(), CollaborationModesConfig::default(), Arc::new(codex_exec_server::EnvironmentManager::new( /*exec_server_url*/ None, diff --git a/codex-rs/core/tests/suite/model_info_overrides.rs b/codex-rs/core/tests/suite/model_info_overrides.rs index 3984801edd..c0f1baf3b3 100644 --- a/codex-rs/core/tests/suite/model_info_overrides.rs +++ b/codex-rs/core/tests/suite/model_info_overrides.rs @@ -106,7 +106,6 @@ async fn custom_model_alias_applies_request_model_and_context_overrides() { experimental_supported_tools: Vec::new(), input_modalities: default_input_modalities(), web_search_tool_type: WebSearchToolType::Text, - prefer_websockets: false, used_fallback_model_metadata: false, }], }), diff --git a/codex-rs/core/tests/suite/remote_models.rs b/codex-rs/core/tests/suite/remote_models.rs index 549206038b..8be7ecfe5b 100644 --- a/codex-rs/core/tests/suite/remote_models.rs +++ b/codex-rs/core/tests/suite/remote_models.rs @@ -319,6 +319,7 @@ async fn custom_model_alias_sends_base_model_slug() -> Result<()> { final_output_json_schema: None, cwd: cwd.path().to_path_buf(), approval_policy: config.permissions.approval_policy.value(), + approvals_reviewer: None, sandbox_policy: config.permissions.sandbox_policy.get().clone(), model: alias.to_string(), effort: None,