aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorfreva <valerijf@yahoo-inc.com>2016-11-15 11:01:39 +0100
committerfreva <valerijf@yahoo-inc.com>2016-11-15 11:01:39 +0100
commitf045e24d8c973c4106d80366d3e72b5263baa895 (patch)
treeb2f9fa54a76a50aee89088428c856e6626586446 /node-admin
parentcf6a185a17988a536aca2d5d5ab2ca590f42153e (diff)
Fix adding/dropping capabilities in CreateContainerCommandImpl
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
index 22df9d03ff6..8e8db0832e0 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
@@ -116,7 +116,6 @@ public class RunVespaLocal {
// TODO: Automatically find correct node to send request to
URL url = new URL("http://cnode-1:" + System.getenv("VESPA_WEB_SERVICE_PORT") + "/");
Instant start = Instant.now();
- System.out.println(start);
boolean okResponse = false;
do {
try {
@@ -125,11 +124,11 @@ public class RunVespaLocal {
} catch (IOException e) {
Thread.sleep(100);
}
- } while (! okResponse || Instant.now().isBefore(start.plusSeconds(120)));
+ } while (! okResponse && Instant.now().isBefore(start.plusSeconds(120)));
assertTrue(okResponse);
// LocalZoneUtils.deleteApplication();
-// nodeAdminStateUpdater.deconstruct();
+ nodeAdminStateUpdater.deconstruct();
}
@Before
@@ -138,7 +137,7 @@ public class RunVespaLocal {
Docker docker = DockerTestUtils.getDocker();
if (!docker.imageIsDownloaded(VESPA_BASE_IMAGE)) {
- logger.info("Pulling base image (This may take a while)");
+ logger.info("Pulling " + VESPA_BASE_IMAGE.asString() + " (This may take a while)");
docker.pullImageAsync(VESPA_BASE_IMAGE).get();
}
}