You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2026/06/13 16:04:06 UTC

(solr-mcp) branch main updated: fix(test): stop double-appending docker image tag suffix (#139)

This is an automated email from the ASF dual-hosted git repository.

epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-mcp.git


The following commit(s) were added to refs/heads/main by this push:
     new 9e58685  fix(test): stop double-appending docker image tag suffix (#139)
9e58685 is described below

commit 9e58685fba14905e949fd5e7273b184de9cfd23d
Author: Aditya Parikh <ad...@gmail.com>
AuthorDate: Sat Jun 13 12:04:00 2026 -0400

    fix(test): stop double-appending docker image tag suffix (#139)
    
    The three Docker integration tests built their image name as:
    
        BuildInfoReader.getDockerImageName()
            + System.getProperty("solr.mcp.docker.image.tag.suffix", "")
    
    but `BuildInfoReader.getDockerImageName()` already appends the same
    system property internally. The suffix was therefore applied twice,
    producing tags like `solr-mcp:1.0.0-SNAPSHOT-native-stdio-native-stdio`
    that don't exist in the local Docker daemon. The native dockerIntegrationTest
    run then 404'd on the pull, and the MCP stdio variant's `docker run`
    subprocess exited before responding, surfacing as a 20s
    `initialize()` timeout.
    
    Drop the caller-side concatenation in all three tests so the tag
    matches the image Paketo produced.
    
    Signed-off-by: adityamparikh <ad...@gmail.com>
    Co-authored-by: Claude Opus 4.7 (1M context) <no...@anthropic.com>
---
 .../mcp/server/containerization/DockerImageHttpIntegrationTest.java    | 3 +--
 .../containerization/DockerImageMcpClientStdioIntegrationTest.java     | 3 +--
 .../mcp/server/containerization/DockerImageStdioIntegrationTest.java   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageHttpIntegrationTest.java b/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageHttpIntegrationTest.java
index 5262a8e..cbf0f88 100644
--- a/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageHttpIntegrationTest.java
+++ b/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageHttpIntegrationTest.java
@@ -94,8 +94,7 @@ class DockerImageHttpIntegrationTest {
 	private static final Logger log = LoggerFactory.getLogger(DockerImageHttpIntegrationTest.class);
 
 	// Docker image name and tag from build-info.properties
-	private static final String DOCKER_IMAGE = BuildInfoReader.getDockerImageName()
-			+ System.getProperty("solr.mcp.docker.image.tag.suffix", "");
+	private static final String DOCKER_IMAGE = BuildInfoReader.getDockerImageName();
 	private static final String SOLR_IMAGE = System.getProperty("solr.test.image");
 	private static final int HTTP_PORT = 8080;
 
diff --git a/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageMcpClientStdioIntegrationTest.java b/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageMcpClientStdioIntegrationTest.java
index 392d397..4202194 100644
--- a/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageMcpClientStdioIntegrationTest.java
+++ b/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageMcpClientStdioIntegrationTest.java
@@ -51,8 +51,7 @@ import org.testcontainers.utility.DockerImageName;
 @Testcontainers(disabledWithoutDocker = true)
 class DockerImageMcpClientStdioIntegrationTest extends McpClientIntegrationTestBase {
 
-	private static final String DOCKER_IMAGE = BuildInfoReader.getDockerImageName()
-			+ System.getProperty("solr.mcp.docker.image.tag.suffix", "");
+	private static final String DOCKER_IMAGE = BuildInfoReader.getDockerImageName();
 
 	@Container
 	static final SolrContainer solrContainer = new SolrContainer(
diff --git a/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageStdioIntegrationTest.java b/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageStdioIntegrationTest.java
index 8336d68..7efb11e 100644
--- a/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageStdioIntegrationTest.java
+++ b/src/test/java/org/apache/solr/mcp/server/containerization/DockerImageStdioIntegrationTest.java
@@ -84,8 +84,7 @@ class DockerImageStdioIntegrationTest {
 	private static final Logger log = LoggerFactory.getLogger(DockerImageStdioIntegrationTest.class);
 
 	// Docker image name and tag from build-info.properties
-	private static final String DOCKER_IMAGE = BuildInfoReader.getDockerImageName()
-			+ System.getProperty("solr.mcp.docker.image.tag.suffix", "");
+	private static final String DOCKER_IMAGE = BuildInfoReader.getDockerImageName();
 	private static final String SOLR_IMAGE = System.getProperty("solr.test.image");
 
 	// Network for container communication