Simplify Docker API

2 files changed, 6 insertions, 2 deletions

diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
index 5ce8c6b093c..dc041b159b5 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.file.Paths;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -27,7 +28,7 @@ public class CreateContainerCommandImplTest {
                 .withUlimit("nproc", 10, 20)
                 .withEnvironment("env1", "val1")
                 .withEnvironment("env2", "val2")
-                .withVolume("vol1", "/host/vol1")
+                .withVolume(Paths.get("vol1"), Paths.get("/host/vol1"))
                 .withAddCapability("SYS_PTRACE")
                 .withAddCapability("SYS_ADMIN")
                 .withDropCapability("NET_ADMIN")
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
index f1a8d4ef65e..8d9ea61c1d9 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
@@ -19,6 +19,8 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Matchers;
 
+import java.util.OptionalLong;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -66,7 +68,8 @@ public class DockerImplTest {
         when(state.isRunning()).thenReturn(false);
         when(state.getExitCode()).thenReturn(exitCode);
 
-        final ProcessResult result = docker.executeInContainer(new ContainerName(containerId), command);
+        final ProcessResult result = docker.executeInContainerAsUser(
+                new ContainerName(containerId), "root", OptionalLong.empty(), command);
         assertThat(result.getExitStatus(), is(exitCode));
     }