Skip to content

test(mcp-test): deflake streamable HTTP version-negotiation integration test #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slachiewicz wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

test(mcp-test): deflake streamable HTTP version-negotiation integration test #1113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ...delcontextprotocol/common/HttpClientStreamableHttpVersionNegotiationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

package io.modelcontextprotocol.common;

import java.time.Duration;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.BiFunction;

import io.modelcontextprotocol.client.McpClient;
Expand All @@ -22,6 +24,7 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.startup.Tomcat;
import static org.awaitility.Awaitility.await;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;

Expand All @@ -37,8 +40,10 @@ class HttpClientStreamableHttpVersionNegotiationIntegrationTests {

private final HttpServletStreamableServerTransportProvider transport = HttpServletStreamableServerTransportProvider
.builder()
.contextExtractor(
req -> McpTransportContext.create(Map.of("protocol-version", req.getHeader("MCP-protocol-version"))))
// The MCP-Protocol-Version header may legitimately be absent on initialize
// requests, so a missing header must not break context extraction.
.contextExtractor(req -> McpTransportContext
.create(Map.of("protocol-version", Objects.requireNonNullElse(req.getHeader("MCP-protocol-version"), ""))))
.build();

private final McpSchema.Tool toolSpec = McpSchema.Tool.builder("test-tool")
Expand Down Expand Up @@ -72,6 +77,12 @@ void usesLatestVersion() {
McpSchema.CallToolResult response = client
.callTool(McpSchema.CallToolRequest.builder("test-tool").arguments(Map.of()).build());

// The GET /mcp stream is opened asynchronously once the initialize response
// creates the session, so wait for it to be recorded before asserting.
await().atMost(Duration.ofSeconds(5))
.untilAsserted(() -> assertThat(requestRecordingFilter.getCalls()).filteredOn(c -> "GET".equals(c.method()))
.hasSize(1));

var calls = requestRecordingFilter.getCalls();

assertThat(calls).filteredOn(c -> !c.body().contains("\"method\":\"initialize\""))
Expand Down
Loading