Fix test for different API behaviour. (docker-java#642)

KostyaSha · web-flow · commit 4c663e18bf16 · 2016-08-01T16:57:52.000+03:00
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -62,6 +62,16 @@ public class RemoteApiVersion implements Serializable {
      */
     public static final RemoteApiVersion VERSION_1_22 = RemoteApiVersion.create(1, 22);
 
+    /**
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md">Docker API 1.22</a>
+     */
+    public static final RemoteApiVersion VERSION_1_23 = RemoteApiVersion.create(1, 23);
+
+    /**
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.24.md">Docker API 1.22</a>
+     */
+    public static final RemoteApiVersion VERSION_1_24 = RemoteApiVersion.create(1, 24);
+
     /**
      * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was added.
      */
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -12,6 +15,7 @@
 import java.security.SecureRandom;
 import java.util.concurrent.TimeUnit;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -193,16 +197,22 @@ public void execStartNotAttachedStdin() throws Exception {
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true)
                 .withAttachStdin(false)
-                .withCmd("/bin/sh").exec();
+                .withCmd("/bin/sh")
+                .exec();
 
         boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId())
                 .withDetach(false)
                 .withStdIn(stdin)
                 .exec(new ExecStartResultCallback(stdout, System.err))
                 .awaitCompletion(5, TimeUnit.SECONDS);
 
-        // with v1.22 of the remote api the server closed the connection when no stdin was attached while exec create, so completed was true
-        assertFalse(completed, "The process was not finished.");
         assertEquals(stdout.toString(), "");
+
+        if (getVersion(dockerClient).isGreaterOrEqual(VERSION_1_23)) {
+            assertFalse(completed, "The process was not finished.");
+        } else {
+            assertTrue(completed, "with v1.22 of the remote api the server closed the connection when no stdin " +
+                    "was attached while exec create, so completed was true");
+        }
     }
 }
