Throws exception when WaitContainerResultCallback timeouts

&#321;ukasz Warcha&#322; · &#321;ukasz Warcha&#322; · commit 0f0353a95a22 · 2016-05-06T11:57:27.000+02:00
Fixes docker-java#570
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -56,7 +56,9 @@ public Integer awaitStatusCode() {
      */
     public Integer awaitStatusCode(long timeout, TimeUnit timeUnit) {
         try {
-            awaitCompletion(timeout, timeUnit);
+            if (!awaitCompletion(timeout, timeUnit)) {
+                throw new DockerClientException("Awaiting status code timeout.");
+            }
         } catch (InterruptedException e) {
             throw new DockerClientException("Awaiting status code interrupted: ", e);
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -1,26 +1,24 @@
 package com.github.dockerjava.core.command;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.WaitResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class WaitContainerCmdImplTest extends AbstractDockerClientTest {
@@ -74,7 +72,7 @@ public void testWaitNonExistingContainer() throws DockerException {
         WaitContainerResultCallback callback = new WaitContainerResultCallback() {
             public void onNext(WaitResponse waitResponse) {
                 fail("expected NotFoundException");
-            };
+            }
         };
 
         dockerClient.waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
@@ -104,4 +102,31 @@ public void testWaitContainerAbort() throws Exception {
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
+
+    @Test
+    public void testWaitContainerTimeout() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+                new WaitContainerResultCallback());
+        try {
+            callback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
+            fail("Should throw exception on timeout.");
+        } catch(DockerClientException e){
+            LOG.info(e.getMessage());
+        }
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
+    }
 }
