aboutsummaryrefslogtreecommitdiffstats
path: root/docker-api/src/test
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-10-23 11:21:27 +0200
committerMartin Polden <mpolden@mpolden.no>2020-10-26 11:10:27 +0100
commit95dbd3f6d126e87fc22f90eab6980eb67d6e5ac5 (patch)
treebb19a541c1b6bed9b07407d73d641b57759e7a41 /docker-api/src/test
parent24fe152948851e1f11c63e86b96a78db91343a61 (diff)
Add support for registry credentials in container engine
Diffstat (limited to 'docker-api/src/test')
-rw-r--r--docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
index 792955ed130..69055e6402c 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
@@ -93,12 +93,12 @@ public class DockerEngineTest {
when(dockerClient.inspectImageCmd(image.asString())).thenReturn(imageInspectCmd);
when(dockerClient.pullImageCmd(eq(image.asString()))).thenReturn(pullImageCmd);
- assertTrue("Should return true, we just scheduled the pull", docker.pullImageAsyncIfNeeded(image));
- assertTrue("Should return true, the pull i still ongoing", docker.pullImageAsyncIfNeeded(image));
+ assertTrue("Should return true, we just scheduled the pull", docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
+ assertTrue("Should return true, the pull i still ongoing", docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
assertTrue(docker.imageIsDownloaded(image));
resultCallback.getValue().onComplete();
- assertFalse(docker.pullImageAsyncIfNeeded(image));
+ assertFalse(docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
}
@Test
@@ -117,15 +117,15 @@ public class DockerEngineTest {
when(dockerClient.inspectImageCmd(image.asString())).thenReturn(imageInspectCmd);
when(dockerClient.pullImageCmd(eq(image.asString()))).thenReturn(pullImageCmd);
- assertTrue("Should return true, we just scheduled the pull", docker.pullImageAsyncIfNeeded(image));
- assertTrue("Should return true, the pull i still ongoing", docker.pullImageAsyncIfNeeded(image));
+ assertTrue("Should return true, we just scheduled the pull", docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
+ assertTrue("Should return true, the pull i still ongoing", docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
try {
resultCallback.getValue().onComplete();
} catch (Exception ignored) { }
assertFalse(docker.imageIsDownloaded(image));
- assertTrue("Should return true, new pull scheduled", docker.pullImageAsyncIfNeeded(image));
+ assertTrue("Should return true, new pull scheduled", docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
}
}