Rename Codex Apps MCP fixtures

This commit is contained in:
Meta Vens 2026-05-14 05:24:54 +01:00
commit 034ea8dfaa
10 changed files with 103 additions and 95 deletions

View file

@ -55,7 +55,7 @@ const TEST_RESOURCE_TEXT: &str = "Resource body from the MCP server.";
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mcp_resource_read_returns_resource_contents() -> Result<()> {
let responses_server = responses::start_mock_server().await;
let (apps_server_url, apps_server_handle) = start_resource_apps_mcp_server().await?;
let (mcp_server_url, mcp_server_handle) = start_resource_demo_mcp_server().await?;
let codex_home = TempDir::new()?;
let responses_server_uri = responses_server.uri();
@ -68,11 +68,11 @@ approval_policy = "untrusted"
sandbox_mode = "read-only"
model_provider = "mock_provider"
chatgpt_base_url = "{apps_server_url}"
chatgpt_base_url = "{mcp_server_url}"
mcp_oauth_credentials_store = "file"
[features]
apps = true
[model_providers.mock_provider]
name = "Mock provider for test"
@ -126,25 +126,25 @@ stream_max_retries = 0
expected_resource_read_response()
);
apps_server_handle.abort();
let _ = apps_server_handle.await;
mcp_server_handle.abort();
let _ = mcp_server_handle.await;
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mcp_resource_read_returns_resource_contents_without_thread() -> Result<()> {
let (apps_server_url, apps_server_handle) = start_resource_apps_mcp_server().await?;
let (mcp_server_url, mcp_server_handle) = start_resource_demo_mcp_server().await?;
let codex_home = TempDir::new()?;
std::fs::write(
codex_home.path().join("config.toml"),
format!(
r#"
chatgpt_base_url = "{apps_server_url}"
chatgpt_base_url = "{mcp_server_url}"
mcp_oauth_credentials_store = "file"
[features]
apps = true
"#
),
)?;
@ -178,8 +178,8 @@ apps = true
expected_resource_read_response()
);
apps_server_handle.abort();
let _ = apps_server_handle.await;
mcp_server_handle.abort();
let _ = mcp_server_handle.await;
Ok(())
}
@ -244,22 +244,22 @@ async fn mcp_resource_read_returns_error_for_unknown_thread() -> Result<()> {
Ok(())
}
async fn start_resource_apps_mcp_server() -> Result<(String, JoinHandle<()>)> {
async fn start_resource_demo_mcp_server() -> Result<(String, JoinHandle<()>)> {
let listener = TcpListener::bind("127.0.0.1:0").await?;
let addr = listener.local_addr()?;
let apps_server_url = format!("http://{addr}");
let mcp_server_url = format!("http://{addr}");
let mcp_service = StreamableHttpService::new(
move || Ok(ResourceAppsMcpServer),
move || Ok(ResourceDemoMcpServer),
Arc::new(LocalSessionManager::default()),
StreamableHttpServerConfig::default(),
);
let router = Router::new().nest_service("/api/mcp/demo", mcp_service);
let apps_server_handle = tokio::spawn(async move {
let mcp_server_handle = tokio::spawn(async move {
let _ = axum::serve(listener, router).await;
});
Ok((apps_server_url, apps_server_handle))
Ok((mcp_server_url, mcp_server_handle))
}
fn expected_resource_read_response() -> McpResourceReadResponse {
@ -282,9 +282,9 @@ fn expected_resource_read_response() -> McpResourceReadResponse {
}
#[derive(Clone, Default)]
struct ResourceAppsMcpServer;
struct ResourceDemoMcpServer;
impl ServerHandler for ResourceAppsMcpServer {
impl ServerHandler for ResourceDemoMcpServer {
fn get_info(&self) -> ServerInfo {
ServerInfo {
protocol_version: ProtocolVersion::V_2025_06_18,

View file

@ -103,10 +103,10 @@ async fn mcp_server_elicitation_round_trip() -> Result<()> {
)
.await;
let (apps_server_url, apps_server_handle) = start_apps_server().await?;
let (mcp_server_url, mcp_server_handle) = start_demo_mcp_server().await?;
let codex_home = TempDir::new()?;
write_config_toml(codex_home.path(), &responses_server.uri(), &apps_server_url)?;
write_config_toml(codex_home.path(), &responses_server.uri(), &mcp_server_url)?;
write_chatgpt_auth(
codex_home.path(),
ChatGptAuthFixture::new("chatgpt-token")
@ -292,21 +292,21 @@ async fn mcp_server_elicitation_round_trip() -> Result<()> {
}])
);
apps_server_handle.abort();
let _ = apps_server_handle.await;
mcp_server_handle.abort();
let _ = mcp_server_handle.await;
Ok(())
}
#[derive(Clone)]
struct AppsServerState {
struct McpServerState {
expected_bearer: String,
expected_account_id: String,
}
#[derive(Clone, Default)]
struct ElicitationAppsMcpServer;
struct ElicitationDemoMcpServer;
impl ServerHandler for ElicitationAppsMcpServer {
impl ServerHandler for ElicitationDemoMcpServer {
fn get_info(&self) -> ServerInfo {
ServerInfo {
protocol_version: rmcp::model::ProtocolVersion::V_2025_06_18,
@ -385,8 +385,8 @@ impl ServerHandler for ElicitationAppsMcpServer {
}
}
async fn start_apps_server() -> Result<(String, JoinHandle<()>)> {
let state = Arc::new(AppsServerState {
async fn start_demo_mcp_server() -> Result<(String, JoinHandle<()>)> {
let state = Arc::new(McpServerState {
expected_bearer: "Bearer chatgpt-token".to_string(),
expected_account_id: "account-123".to_string(),
});
@ -395,7 +395,7 @@ async fn start_apps_server() -> Result<(String, JoinHandle<()>)> {
let addr = listener.local_addr()?;
let mcp_service = StreamableHttpService::new(
move || Ok(ElicitationAppsMcpServer),
move || Ok(ElicitationDemoMcpServer),
Arc::new(LocalSessionManager::default()),
StreamableHttpServerConfig::default(),
);
@ -417,7 +417,7 @@ async fn start_apps_server() -> Result<(String, JoinHandle<()>)> {
}
async fn list_directory_connectors(
State(state): State<Arc<AppsServerState>>,
State(state): State<Arc<McpServerState>>,
headers: HeaderMap,
uri: Uri,
) -> Result<Json<serde_json::Value>, StatusCode> {
@ -461,7 +461,7 @@ async fn list_directory_connectors(
fn write_config_toml(
codex_home: &std::path::Path,
responses_server_uri: &str,
apps_server_url: &str,
mcp_server_url: &str,
) -> std::io::Result<()> {
std::fs::write(
codex_home.join("config.toml"),
@ -472,11 +472,11 @@ approval_policy = "untrusted"
sandbox_mode = "read-only"
model_provider = "mock_provider"
chatgpt_base_url = "{apps_server_url}"
chatgpt_base_url = "{mcp_server_url}"
mcp_oauth_credentials_store = "file"
[features]
apps = true
[model_providers.mock_provider]
name = "Mock provider for test"

View file

@ -162,9 +162,9 @@ async fn mcp_server_tool_call_returns_error_for_unknown_thread() -> Result<()> {
}
#[derive(Clone, Default)]
struct ToolAppsMcpServer;
struct ToolDemoMcpServer;
impl ServerHandler for ToolAppsMcpServer {
impl ServerHandler for ToolDemoMcpServer {
fn get_info(&self) -> ServerInfo {
ServerInfo {
capabilities: ServerCapabilities::builder().enable_tools().build(),
@ -238,7 +238,7 @@ async fn start_mcp_server() -> Result<(String, JoinHandle<()>)> {
let listener = TcpListener::bind("127.0.0.1:0").await?;
let addr = listener.local_addr()?;
let mcp_service = StreamableHttpService::new(
|| Ok(ToolAppsMcpServer),
|| Ok(ToolDemoMcpServer),
Arc::new(LocalSessionManager::default()),
StreamableHttpServerConfig::default(),
);