Fixing tests for Exec-start and Exec-create.

Andrey Klimachev · Andrey Klimachev · commit 5a6c46d297bc · 2015-01-10T11:56:11.000Z
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
@@ -41,7 +41,7 @@ public void execCreateTest() {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox").withCmd("env")
+                .createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -50,9 +50,7 @@ public void execCreateTest() {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        dockerClient.waitContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId()).withCmd("touch file.log").exec();
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId()).withCmd("touch","file.log").exec();
 
         assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -15,6 +15,7 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
+@Test(groups = "integration")
 public class ExecStartCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
     public void beforeTest() throws DockerException {
@@ -41,7 +42,7 @@ public void execStartTest() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox").withCmd("env")
+                .createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -50,13 +51,10 @@ public void execStartTest() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        dockerClient.waitContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId()).withCmd("touch","file.log").exec();
-
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId()).attachStdout(true).withCmd("touch","file.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec();
 
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "file.log").exec();
+        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/file.log").exec();
         assertTrue(response.available() > 0, "The file was not copied from the container.");
     }
 }
