FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fixed missing test resources for cacheFrom test by kish3007 · Pull Request #894 · docker-java/docker-java · GitHub

  1. docker-java
  2. docker-java

Repository navigation

Fixed missing test resources for cacheFrom test #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KostyaSha merged 1 commit into from
Aug 12, 2017
Conversation 3 Commits 1 Checks 0 Files changed
Merged

Fixed missing test resources for cacheFrom test #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .java  (2) No extension  (2) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 2 additions & 1 deletion src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 7 additions & 0 deletions src/test/resources/buildTests/CacheFrom/test1/Dockerfile
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM ubuntu:latest

RUN echo "Step 1"

RUN echo "Step 2"

RUN echo "Step 3"
9 changes: 9 additions & 0 deletions src/test/resources/buildTests/CacheFrom/test2/Dockerfile
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM ubuntu:latest

RUN echo "Step 1"

RUN echo "Step 2"

RUN echo "Step 3"

RUN echo "Step 4"
Back | FazBrowse Home | New Git URL