summaryrefslogtreecommitdiffstats
path: root/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-10-26 14:42:25 +0100
committerGitHub <noreply@github.com>2020-10-26 14:42:25 +0100
commit348a3e3e433b91edb7c2becbda255747fe8983c2 (patch)
tree3ce04671dfd87fdbde047b26575693b308bbc847 /docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
parent6e23dcf00c5307a157881be88548363d21c58b38 (diff)
parent1018e9bfa84d7f40ecf9dd9818ec464d59bdedf9 (diff)
Merge pull request #15035 from vespa-engine/mpolden/registry-credentials
Add support for registry credentials in container engine
Diffstat (limited to 'docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java')
-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));
}
}