Restore original pull/push expected exception logic

fbuecklers · fbuecklers · commit 7e24a136ba32 · 2017-10-31T21:02:23.000+01:00
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -7,6 +7,7 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageCmdImpl;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import org.junit.Rule;
@@ -17,9 +18,9 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
@@ -96,8 +97,12 @@ public void testPullImage() throws Exception {
 
     @Test
     public void testPullNonExistingImage() throws Exception {
-        //different docker version throws different errors here
-        exception.expect(anyOf(instanceOf(NotFoundException.class), instanceOf(DockerClientException.class)));
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
+                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_26)) {
+            exception.expect(NotFoundException.class);
+        } else {
+            exception.expect(DockerClientException.class);
+        }
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd("xvxcv/foo")
diff --git a/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.junit.category.AuthIntegration;
@@ -16,9 +17,9 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
@@ -62,11 +63,17 @@ public void pushLatest() throws Exception {
 
     @Test
     public void pushNonExistentImage() throws Exception {
-        //swarms throws a different error here
-        exception.expect(anyOf(instanceOf(DockerClientException.class), instanceOf(NotFoundException.class)));
+
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
+                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            exception.expect(DockerClientException.class);
+        } else {
+            exception.expect(NotFoundException.class);
+        }
 
         dockerRule.getClient().pushImageCmd(username + "/xxx")
                 .exec(new PushImageResultCallback())
-                .awaitCompletion(30, TimeUnit.SECONDS);
+                .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep
+
     }
 }
