Test update only for >= 1.22

KostyaSha · KostyaSha · commit 5400925fbdd9 · 2016-03-04T19:21:57.000+03:00
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -20,6 +21,7 @@
 import java.lang.reflect.Method;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -55,14 +57,19 @@ public void afterMethod(ITestResult result) {
 
     @Test(groups = "ignoreInCircleCi")
     public void updateContainer() throws DockerException, IOException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
+            throw new SkipException("API version should be >= 1.22");
+        }
+
         CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
                 .withCmd("sleep", "9999")
                 .exec();
         String containerId = response.getId();
         dockerClient.startContainerCmd(containerId).exec();
 
         InspectContainerResponse inspectBefore = dockerClient.inspectContainerCmd(containerId).exec();
-        final HostConfig beforeHostConfig = inspectBefore.getHostConfig();
 
         final UpdateContainerResponse updateResponse = dockerClient.updateContainerCmd(containerId)
                 .withBlkioWeight(300)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
@@ -5,10 +5,12 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -18,6 +20,7 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -52,6 +55,12 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void updateContainer() throws DockerException, IOException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
+            throw new SkipException("API version should be >= 1.22");
+        }
+
         CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
                 .withCmd("sleep", "9999")
                 .exec();
