Skip to content

Commit 0707f27

Browse files
committed
fix:test
1 parent 915fc19 commit 0707f27

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ subprojects {
9696
displayGranularity 1
9797
showStackTraces = true
9898
exceptionFormat = 'full'
99-
events "STARTED", "PASSED", "FAILED", "SKIPPED", "STANDARD_OUT", "STANDARD_ERROR"
99+
// events "STARTED", "PASSED", "FAILED", "SKIPPED", "STANDARD_OUT", "STANDARD_ERROR"
100+
events "STARTED", "PASSED", "FAILED", "SKIPPED"
100101
}
101102
ext.isCI = System.getenv("CI") != null
102103
if (isCI) {

core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
import com.github.dockerjava.api.model.Network;
66
import com.github.dockerjava.core.DefaultDockerClientConfig;
77
import com.github.dockerjava.core.DockerClientImpl;
8-
import com.github.dockerjava.core.RemoteApiVersion;
98
import com.github.dockerjava.transport.DockerHttpClient;
109
import com.github.dockerjava.transport.NamedPipeSocket;
1110
import com.github.dockerjava.transport.SSLConfig;
1211
import com.github.dockerjava.transport.UnixSocket;
1312
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
14-
1513
import com.google.common.annotations.VisibleForTesting;
1614
import com.google.common.base.Throwables;
1715
import lombok.Getter;
@@ -28,15 +26,7 @@
2826
import org.testcontainers.UnstableAPI;
2927
import org.testcontainers.utility.TestcontainersConfiguration;
3028

31-
import java.nio.charset.StandardCharsets;
32-
import java.util.regex.Matcher;
33-
import java.util.regex.Pattern;
34-
35-
36-
import java.io.BufferedReader;
3729
import java.io.File;
38-
import java.io.IOException;
39-
import java.io.InputStreamReader;
4030
import java.net.InetSocketAddress;
4131
import java.net.Socket;
4232
import java.net.SocketAddress;
@@ -484,7 +474,6 @@ static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost, bo
484474
return null;
485475
}
486476
}
487-
488477
// private static String getDockerApiVersionFromClient(DockerHttpClient client) {
489478
// try {
490479
// DockerHttpClient.Request request = DockerHttpClient.Request.builder()
@@ -495,7 +484,7 @@ static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost, bo
495484
// try (DockerHttpClient.Response response = client.execute(request)) {
496485
// if (response.getStatusCode() == 200) {
497486
// String body = IOUtils.toString(response.getBody(), java.nio.charset.StandardCharsets.UTF_8);
498-
487+
499488
// java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\"ApiVersion\"\\s*:\\s*\"([0-9.]+)\"");
500489
// java.util.regex.Matcher matcher = pattern.matcher(body);
501490
// if (matcher.find()) {

core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static org.assertj.core.api.Assertions.assertThat;
99

10-
@Disabled()
10+
@Disabled
1111
class DockerMcpGatewayContainerTest {
1212

1313
@Test

0 commit comments

Comments
 (0)