Merge pull request #296 from xenit-eu/unignore-tests

Revert "Ignore test awaiting bugfix gradle-docker-plugin dependency"
xenit-eu · Aug 6, 2024 · e37870b · e37870b
2 parents 8f7c68a + 435f899
commit e37870b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/integrationTest/java/eu/xenit/gradle/testrunner/Reproductions.java b/src/integrationTest/java/eu/xenit/gradle/testrunner/Reproductions.java
@@ -15,7 +15,6 @@
 import org.gradle.testkit.runner.TaskOutcome;
 import org.gradle.util.GradleVersion;
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -132,7 +131,6 @@ public void testIssue104() throws IOException {
     }
 
     @Test
-    @Ignore("Waiting for a fix for https://github.com/bmuschko/gradle-docker-plugin/issues/1158")
     public void testIssue107() throws IOException {
         testProjectFolder(REPRODUCTIONS.resolve("issue-107"), ":functionalTest");
     }

diff --git a/src/integrationTest/reproductions/issue-107/build.gradle b/src/integrationTest/reproductions/issue-107/build.gradle
@@ -35,13 +35,14 @@ import com.bmuschko.gradle.docker.tasks.image.*
 
 task saveDockerImage(type: DockerSaveImage) {
     dependsOn(buildDockerImage)
-    image = buildDockerImage.imageId
+    images.add(buildDockerImage.imageId)
     destFile = project.layout.buildDirectory.file("builtImage.tar")
 }
 
 task saveBaseDockerImage(type: DockerSaveImage) {
-    image = dockerAlfresco.baseImage
+    images.add(dockerAlfresco.baseImage)
     destFile = project.layout.buildDirectory.file("originalImage.tar")
+    mustRunAfter(buildDockerImage) // because the build pulls the base image if it does not exist on disk yet
 }
 import java.util.stream.Collectors
 import java.util.stream.Stream