Lightweight coding agent that runs in your terminal
Rust
Wait for MCP readiness in the curated sync test (#35794)
Adam Perry @ OpenAI4f6eaf7af9d9
diff --git a/codex-rs/app-server/tests/suite/v2/curated_mcp_sync.rs b/codex-rs/app-server/tests/suite/v2/curated_mcp_sync.rsindex 6143d0cd0a..8f69d20078 100644--- a/codex-rs/app-server/tests/suite/v2/curated_mcp_sync.rs+++ b/codex-rs/app-server/tests/suite/v2/curated_mcp_sync.rs@@ -185,7 +185,7 @@ async fn existing_thread_loads_api_curated_mcp_after_auth_switch_sync() -> Resul.thread.id;// Establish the existing thread's MCP runtime while curated Git sync is still blocked.- wait_for_mcp_starting(&mut fixture.mcp, REFRESH_PROBE_SERVER_NAME).await?;+ wait_for_mcp_ready(&mut fixture.mcp, REFRESH_PROBE_SERVER_NAME).await?;let request_id = fixture.mcp@@ -203,11 +203,11 @@ async fn existing_thread_loads_api_curated_mcp_after_auth_switch_sync() -> Resul.await??;// The account-change refresh has completed without the API-curated bundle on disk.- wait_for_mcp_starting(&mut fixture.mcp, REFRESH_PROBE_SERVER_NAME).await?;+ wait_for_mcp_ready(&mut fixture.mcp, REFRESH_PROBE_SERVER_NAME).await?;// Let sync materialize the bundle; its completion callback must refresh this same thread.std::fs::write(&fixture.sync_barrier, "continue")?;- wait_for_mcp_starting(&mut fixture.mcp, TEST_SERVER_NAME).await?;+ wait_for_mcp_ready(&mut fixture.mcp, TEST_SERVER_NAME).await?;let response: McpServerToolCallResponse = fixture.mcp@@ -235,11 +235,11 @@ async fn existing_thread_loads_api_curated_mcp_after_auth_switch_sync() -> ResulOk(())}-async fn wait_for_mcp_starting(mcp: &mut TestAppServer, server_name: &str) -> Result<()> {+async fn wait_for_mcp_ready(mcp: &mut TestAppServer, server_name: &str) -> Result<()> {timeout(DEFAULT_TIMEOUT,mcp.read_stream_until_matching_notification(- "mcpServer/startupStatus/updated starting",+ "mcpServer/startupStatus/updated ready",|notification| {notification.method == "mcpServer/startupStatus/updated"&& notification@@ -253,7 +253,7 @@ async fn wait_for_mcp_starting(mcp: &mut TestAppServer, server_name: &str) -> Re.as_ref().and_then(|params| params.get("status")).and_then(serde_json::Value::as_str)- == Some("starting")+ == Some("ready")},),)