From a4950c04a5bd65cb2d6eddd406ff4046beaa6810 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Thu, 12 Dec 2024 21:45:44 +0100 Subject: [PATCH] test: increase MCP client timeout to 20s and enable tests - Doubles the default timeout from 10s to 20s in McpAsyncClient - Updates corresponding timeout values in test classes - Enables previously disabled async client tests --- .../org/springframework/ai/mcp/client/McpAsyncClient.java | 2 +- .../springframework/ai/mcp/client/McpAsyncClientTests.java | 5 +---- .../springframework/ai/mcp/client/McpSyncClientTests.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpAsyncClient.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpAsyncClient.java index 4589855..7c5af87 100644 --- a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpAsyncClient.java +++ b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpAsyncClient.java @@ -40,7 +40,7 @@ public class McpAsyncClient extends DefaultMcpSession { }; public McpAsyncClient(McpTransport transport) { - this(transport, Duration.ofSeconds(10), new ObjectMapper()); + this(transport, Duration.ofSeconds(20), new ObjectMapper()); } public McpAsyncClient(McpTransport transport, Duration requestTimeout, ObjectMapper objectMapper) { diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpAsyncClientTests.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpAsyncClientTests.java index e943a26..ad8c1da 100644 --- a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpAsyncClientTests.java +++ b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpAsyncClientTests.java @@ -22,7 +22,6 @@ import java.util.Map; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import reactor.test.StepVerifier; @@ -45,7 +44,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; * @author Christian Tzolov * @author Dariusz Jędrzejczyk */ -@Disabled @Timeout(15) // Giving extra time beyond the client timeout class McpAsyncClientTests { @@ -53,7 +51,7 @@ class McpAsyncClientTests { private ServerParameters stdioParams; - private static final Duration TIMEOUT = Duration.ofSeconds(10); + private static final Duration TIMEOUT = Duration.ofSeconds(20); private static final String TEST_MESSAGE = "Hello MCP Spring AI!"; @@ -144,7 +142,6 @@ class McpAsyncClientTests { }).verifyComplete(); } - @Disabled @Test void testMcpAsyncClientState() { assertThat(mcpAsyncClient).isNotNull(); diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpSyncClientTests.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpSyncClientTests.java index df81fab..545a4bb 100644 --- a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpSyncClientTests.java +++ b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpSyncClientTests.java @@ -52,7 +52,7 @@ class McpSyncClientTests { private ServerParameters stdioParams; - private static final Duration TIMEOUT = Duration.ofSeconds(10); + private static final Duration TIMEOUT = Duration.ofSeconds(20); private static final String TEST_MESSAGE = "Hello MCP Spring AI!";