Updated test.

alexec · alexec · commit 92aa1bbfe6b4 · 2015-05-03T11:50:06.000+01:00
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.model.Image;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,16 +33,18 @@ public void open() throws Exception {
                 .exec()
                 .close();
 
-        repository = dockerClient
+        Image lastCreatedImage = dockerClient
                 .listImagesCmd()
                 .exec()
-                .get(0)
+                .get(0);
+
+        repository = lastCreatedImage
                 .getRepoTags()[0];
 
-        LOGGER.info("created {}", repository);
+        LOGGER.info("created {} {}", lastCreatedImage.getId(), repository);
 
         containerId = dockerClient
-                .createContainerCmd(repository)
+                .createContainerCmd(lastCreatedImage.getId())
                 .exec()
                 .getId();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -10,6 +10,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 @Test(groups = "integration")
@@ -41,20 +42,52 @@ public void afterTest() {
     }
 
     @Test
-    public void canCloseFrameReaderAndReadExpectedLinens() throws Exception {
+    public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
 
-        InputStream log = dockerClient
+        try (FrameReader reader = new FrameReader(getLoggerStream())) {
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, String.format("to stdout%n").getBytes()));
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, String.format("to stderr%n").getBytes()));
+            assertNull(reader.readFrame());
+        }
+    }
+
+    private InputStream getLoggerStream() {
+        return dockerClient
                 .logContainerCmd(dockerfileFixture.getContainerId())
                 .withStdOut()
                 .withStdErr()
-                .withFollowStream()
                 .withTailAll()
+                .withTail(10)
+                .withFollowStream()
                 .exec();
+    }
 
-        try (FrameReader reader = new FrameReader(log)) {
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, String.format("to stdout%n").getBytes()));
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, String.format("to stderr%n").getBytes()));
-            assertNull(reader.readFrame());
+    @Test
+    public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
+
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    try (FrameReader reader = new FrameReader(getLoggerStream())) {
+                        //noinspection StatementWithEmptyBody
+                        while (reader.readFrame() != null) {
+                            // nop
+                        }
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        thread.start();
+
+        try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(dockerClient, "busyboxDockerfile")) {
+            busyboxDockerfile.open();
         }
+
+        thread.join();
+
     }
 }
diff --git a/src/test/resources/busyboxDockerfile/Dockerfile b/src/test/resources/busyboxDockerfile/Dockerfile
@@ -0,0 +1,3 @@
+FROM busybox:latest
+
+CMD ["cat"]
diff --git a/src/test/resources/frameReaderDockerfile/Dockerfile b/src/test/resources/frameReaderDockerfile/Dockerfile
@@ -3,8 +3,11 @@ FROM busybox:latest
 # log to stdout and stderr so we can make sure logging with FrameReader works
 
 RUN echo '#! /bin/sh' > cmd.sh
+RUN echo 'sleep 1' >> cmd.sh
 RUN echo 'echo "to stdout"' >> cmd.sh
 RUN echo 'echo "to stderr" > /dev/stderr' >> cmd.sh
+# block for ever
+RUN echo 'cat' >> cmd.sh
 RUN chmod +x cmd.sh
 
 CMD ["./cmd.sh"]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+FROM busybox:latest`
	`2`	`+`
	`3`	`+CMD ["cat"]`