Lightweight coding agent that runs in your terminal
Rust
Harden the auto-review model override test (#36167)
jif13ddc7aa5743
diff --git a/codex-rs/core/tests/suite/auto_review.rs b/codex-rs/core/tests/suite/auto_review.rsindex 317ae835fc..e20432ea54 100644--- a/codex-rs/core/tests/suite/auto_review.rs+++ b/codex-rs/core/tests/suite/auto_review.rs@@ -28,7 +28,6 @@ use core_test_support::responses::ev_assistant_message;use core_test_support::responses::ev_completed;use core_test_support::responses::ev_function_call;use core_test_support::responses::ev_response_created;-use core_test_support::responses::mount_models_once;use core_test_support::responses::mount_sse_sequence;use core_test_support::responses::sse;use core_test_support::skip_if_no_network;@@ -41,7 +40,12 @@ use core_test_support::wait_for_event;use core_test_support::wait_for_event_with_timeout;use pretty_assertions::assert_eq;use serde_json::json;+use tokio::time::timeout;+use wiremock::Mock;use wiremock::MockServer;+use wiremock::ResponseTemplate;+use wiremock::matchers::method;+use wiremock::matchers::path;#[tokio::test(flavor = "multi_thread", worker_threads = 2)]async fn remote_model_override_uses_catalog_model_for_strict_auto_review() -> Result<()> {@@ -51,13 +55,14 @@ async fn remote_model_override_uses_catalog_model_for_strict_auto_review() -> Relet server = MockServer::start().await;let model = "remote-auto-review-parent";let review_model = "remote-auto-review-reviewer";- mount_models_once(- &server,- ModelsResponse {+ Mock::given(method("GET"))+ .and(path("/v1/models"))+ .respond_with(ResponseTemplate::new(200).set_body_json(ModelsResponse {models: vec![remote_model_with_auto_review_override(model, review_model)],- },- )- .await;+ }))+ .expect(1..)+ .mount(&server)+ .await;let permissions_call_id = "auto-review-permissions-call";let permissions_args = json!({@@ -133,12 +138,23 @@ async fn remote_model_override_uses_catalog_model_for_strict_auto_review() -> Re} = builder.build(&server).await?;let models_manager = thread_manager.get_models_manager();- models_manager- .list_models(- RefreshStrategy::OnlineIfUncached,+ timeout(+ Duration::from_secs(10),+ models_manager.list_models(+ RefreshStrategy::Online,codex_core::test_support::default_http_client_factory(),- )- .await;+ ),+ )+ .await?;+ assert!(+ server+ .received_requests()+ .await+ .expect("mock server should retain received requests")+ .iter()+ .any(|request| request.method == "GET" && request.url.path() == "/v1/models"),+ "expected the model catalog to be fetched remotely"+ );let model_info = models_manager.get_model_info(model, &config.to_models_manager_config()).await;@@ -222,6 +238,8 @@ async fn remote_model_override_uses_catalog_model_for_strict_auto_review() -> ReSome(review_model));+ timeout(Duration::from_secs(10), codex.shutdown_and_wait()).await??;+Ok(())}