diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2017-01-19 13:28:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 13:28:51 +0100 |
| commit | 439e9fdf1496c75b8cf356f65863a2c8e7a8909a (patch) | |
| tree | ac7880d73050ade602511e71a1f3bfa32b6b900b /docker-api | |
| parent | 6999811bff537b554ac7084247e50655466f6345 (diff) | |
| parent | 2e0c17f74c1930ba9a05c169ca198a4ff110af02 (diff) | |
Merge pull request #1545 from yahoo/musum/set-timeouts
Set timeout, update doc, skip javadoc generation
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java | 3 | ||||
| -rw-r--r-- | docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java | 4 |
2 files changed, 4 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 523abe0f5ce..eedba03d3c5 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,7 +24,8 @@ 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(100) + .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 e7a695f85b2..b6280bc7178 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 @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; /** * <pre> - * Requires docker daemon, see {@link com.yahoo.vespa.hosted.dockerapi.DockerTestUtils} for more details. + * Requires docker daemon, see node-admin/README.md for how to install and configure. * * To get started: * 1. Add system test host hostnames to /etc/hosts: @@ -117,7 +117,7 @@ public class RunSystemTests { } try { - executeInContainer(containerName, "mvn", "-DskipTests", "-e", + executeInContainer(containerName, "mvn", "-DskipTests", "-Dmaven.javadoc.skip=true", "-e", "-f=" + pathToModule.resolve("pom.xml"), "install"); executeInContainer(containerName, "rsync", "--archive", "--existing", "--update", |