More Test fixes

fbuecklers · fbuecklers · commit fe2c5eeff3d5 · 2017-11-07T12:55:44.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
@@ -132,7 +132,8 @@ public void testPullImageWithNoAuth() throws Exception {
 
         String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-no-auth");
 
-        if (isNotSwarm(dockerRule.getClient())) {
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
+                .isGreater(RemoteApiVersion.VERSION_1_27)) {
             exception.expect(InternalServerErrorException.class);
         } else {
             exception.expect(DockerClientException.class);
@@ -156,7 +157,8 @@ public void testPullImageWithInvalidAuth() throws Exception {
 
         String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-invalid-auth");
 
-        if (isNotSwarm(dockerRule.getClient())) {
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
+                .isGreater(RemoteApiVersion.VERSION_1_27)) {
             exception.expect(InternalServerErrorException.class);
         } else {
             exception.expect(DockerClientException.class);
diff --git a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
@@ -5,6 +5,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -86,6 +87,6 @@ public void readMultipleCaCerts() throws Exception {
     }
 
     private String readFileAsString(String path) throws IOException {
-        return new String(Files.readAllBytes(Paths.get(baseDir + path)));
+        return new String(Files.readAllBytes(Paths.get(new File(baseDir + path).getPath())));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
@@ -97,10 +97,12 @@ public static String createPrivateImage(DockerRule dockerRule, String tagName) t
                 .exec(new PushImageResultCallback())
                 .awaitCompletion(30, TimeUnit.SECONDS);
 
-        Thread.sleep(5000); //ensures that the image is also purged from the swarm cache
         dockerRule.getClient().removeImageCmd(imgNameWithTag)
                 .exec();
 
+        //ensures that the image is available
+        Thread.sleep(5000);
+
         return imgNameWithTag;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import org.junit.BeforeClass;`
`6`	`6`	`import org.junit.Test;`
`7`	`7`
	`8`	`+import java.io.File;`
`8`	`9`	`import java.io.IOException;`
`9`	`10`	`import java.nio.file.Files;`
`10`	`11`	`import java.nio.file.Paths;`
`@@ -86,6 +87,6 @@ public void readMultipleCaCerts() throws Exception {`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`private String readFileAsString(String path) throws IOException {`
`89`		`- return new String(Files.readAllBytes(Paths.get(baseDir + path)));`
	`90`	`+ return new String(Files.readAllBytes(Paths.get(new File(baseDir + path).getPath())));`
`90`	`91`	`}`
`91`	`92`	`}`