diff options
| author | freva <valerijf@yahoo-inc.com> | 2017-01-19 15:26:55 +0100 |
|---|---|---|
| committer | freva <valerijf@yahoo-inc.com> | 2017-01-19 15:26:55 +0100 |
| commit | a870175bb42d077e0c294ff981a4c39582cc9f74 (patch) | |
| tree | 0647bd730df7e797b91972ee5db31af6337cfe50 /docker-api | |
| parent | 439e9fdf1496c75b8cf356f65863a2c8e7a8909a (diff) | |
Remove docker-java connection/read timeouts for local running
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java | 2 | ||||
| -rw-r--r-- | docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java index eedba03d3c5..99e9a18f9a9 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java @@ -24,8 +24,6 @@ public class DockerTestUtils { .clientCertPath(operatingSystem == OS.Mac_OS_X ? prefix + "cert.pem" : "") .clientKeyPath( operatingSystem == OS.Mac_OS_X ? prefix + "key.pem" : "") .uri( operatingSystem == OS.Mac_OS_X ? "tcp://192.168.99.100:2376" : "tcp://localhost:2376") - .connectTimeoutMillis(5000) - .readTimeoutMillis(5000) .secondsToWaitBeforeKillingContainer(0)); private static DockerImpl docker; diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java index b6280bc7178..fdd9381114e 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java @@ -142,7 +142,7 @@ public class RunSystemTests { else docker.deleteContainer(containerName); } - logger.info("Starting systemtests host"); + logger.info("Starting systemtests container " + containerName.asString()); InetAddress nodeInetAddress = InetAddress.getByName(containerName.asString()); docker.createContainerCommand( SYSTEMTESTS_DOCKER_IMAGE, |