Merge pull request #894 from kish3007/cacheFromTest

KostyaSha · web-flow · commit 42a50ec66296 · 2017-08-13T02:30:42.000+03:00
Fixed missing test resources for cacheFrom test
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -326,7 +326,8 @@ public void cacheFrom() throws Exception {
     	assertThat(inspectImageResponse1, not(nullValue()));
     	
     	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
-    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
+    	String cacheImage = String.format("[\"%s\"]", imageId1);
+    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
     			.exec(new BuildImageResultCallback())
     			.awaitImageId();
     	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -331,7 +331,8 @@ public void cacheFrom() throws Exception {
     	assertThat(inspectImageResponse1, not(nullValue()));
     	
     	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
-    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
+    	String cacheImage = String.format("[\"%s\"]", imageId1);
+    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
     			.exec(new BuildImageResultCallback())
     			.awaitImageId();
     	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
diff --git a/src/test/resources/buildTests/CacheFrom/test1/Dockerfile b/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
@@ -0,0 +1,7 @@
+FROM ubuntu:latest
+
+RUN echo "Step 1"
+
+RUN echo "Step 2"
+
+RUN echo "Step 3"
diff --git a/src/test/resources/buildTests/CacheFrom/test2/Dockerfile b/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:latest
+
+RUN echo "Step 1"
+
+RUN echo "Step 2"
+
+RUN echo "Step 3"
+
+RUN echo "Step 4"
