run core tests in parallel (#5365)

bsideup · web-flow · commit bf70b4093fd3 · 2022-05-15T11:00:06.000-04:00
* run `core` tests in parallel

* ooops

* Dummy change

* dummy change (2)
diff --git a/core/build.gradle b/core/build.gradle
@@ -6,6 +6,8 @@ sourceSets {
     jarFileTest
 }
 
+test.maxParallelForks = 4
+
 idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs
 
 shadowJar {
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -1,18 +1,16 @@
 package org.testcontainers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import com.github.dockerjava.api.exception.NotFoundException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory.DiskSpaceUsage;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
-import org.testcontainers.images.LocalImagesCacheAccessor;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 /**
  * Test for {@link DockerClientFactory}.
  */
@@ -23,30 +21,22 @@ public class DockerClientFactoryTest {
 
     @Test
     public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
+        try (DockerRegistryContainer registryContainer = new DockerRegistryContainer()) {
+            registryContainer.start();
+            DockerImageName imageName = registryContainer.createImage();
 
-        final DockerClientFactory dockFactory = DockerClientFactory.instance();
+            DockerClientFactory dockFactory = DockerClientFactory.instance();
 
-        DockerImageName imageName = DockerImageName.parse("testcontainers/helloworld:1.1.0");
-
-        try {
-            //remove tiny image, so it will be pulled during next command run
-            dockFactory.client()
-                    .removeImageCmd(imageName.asCanonicalNameString())
-                    .withForce(true).exec();
-        } catch (NotFoundException ignored) {
-            // Do not fail if it's not pulled yet
-        }
-        LocalImagesCacheAccessor.clearCache();
-
-        dockFactory.runInsideDocker(
+            dockFactory.runInsideDocker(
                 imageName,
                 cmd -> cmd.withCmd("sh", "-c", "echo 'SUCCESS'"),
                 (client, id) ->
-                        client.logContainerCmd(id)
-                                .withStdOut(true)
-                                .exec(new LogToStringContainerCallback())
-                                .toString()
-        );
+                    client.logContainerCmd(id)
+                        .withStdOut(true)
+                        .exec(new LogToStringContainerCallback())
+                        .toString()
+            );
+        }
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
@@ -1,14 +1,20 @@
 package org.testcontainers;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.PullImageResultCallback;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.WaitingConsumer;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 
+import java.util.UUID;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -65,4 +71,34 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
 
         endpoint = getHost() + ":" + port.get();
     }
+
+    public DockerImageName createImage() {
+        return createImage(UUID.randomUUID().toString());
+    }
+
+    public DockerImageName createImage(String tag) {
+        return createImage("testcontainers/helloworld:latest", tag);
+    }
+
+    @SneakyThrows(InterruptedException.class)
+    public DockerImageName createImage(String originalImage, String tag) {
+        DockerClient client = getDockerClient();
+        client.pullImageCmd(originalImage).exec(new PullImageResultCallback()).awaitCompletion();
+
+        String dummyImageId = client.inspectImageCmd(originalImage).exec().getId();
+
+        DockerImageName imageName = DockerImageName.parse(getEndpoint() + "/" + Base58.randomString(6).toLowerCase()).withTag(tag);
+
+        // push the image to the registry
+        client.tagImageCmd(dummyImageId, imageName.asCanonicalNameString(), tag).exec();
+
+        client.pushImageCmd(imageName.asCanonicalNameString())
+            .exec(new ResultCallback.Adapter<>())
+            .awaitCompletion(1, TimeUnit.MINUTES);
+
+        // Remove from local cache, tests should pull the image themselves
+        client.removeImageCmd(imageName.asCanonicalNameString()).exec();
+
+        return imageName;
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
@@ -1,32 +1,25 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.model.Image;
 import org.junit.Test;
-import org.testcontainers.DockerClientFactory;
+import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.List;
-
 public class AmbiguousImagePullTest {
 
     @Test(timeout = 30_000)
     public void testNotUsingParse() {
-        DockerClient client = DockerClientFactory.instance().client();
-        List<Image> alpineImages = client.listImagesCmd()
-            .withImageNameFilter("testcontainers/helloworld:latest")
-            .exec();
-        for (Image alpineImage : alpineImages) {
-            client.removeImageCmd(alpineImage.getId()).exec();
-        }
-
-        try (
-            final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld"))
-                .withExposedPorts(8080)
-        ) {
-            container.start();
-            // do nothing other than start and stop
+        try (DockerRegistryContainer registryContainer = new DockerRegistryContainer()) {
+            registryContainer.start();
+            DockerImageName imageName = registryContainer.createImage("latest");
+            String imageNameWithoutTag = imageName.getRegistry() + "/" + imageName.getRepository();
+            try (
+                final GenericContainer<?> container = new GenericContainer<>(imageNameWithoutTag)
+                    .withExposedPorts(8080)
+            ) {
+                container.start();
+                // do nothing other than start and stop
+            }
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -1,12 +1,6 @@
 package org.testcontainers.images;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.exception.NotFoundException;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -18,9 +12,6 @@
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 
@@ -29,47 +20,13 @@ public class ImagePullPolicyTest {
     @ClassRule
     public static DockerRegistryContainer registry = new DockerRegistryContainer();
 
-    private static DockerImageName imageName;
-
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        String testRegistryAddress = registry.getEndpoint();
-        String testImageName = testRegistryAddress + "/image-pull-policy-test";
-        String tag = UUID.randomUUID().toString();
-        imageName = DockerImageName.parse(testImageName).withTag(tag);
-
-        DockerClient client = DockerClientFactory.instance().client();
-        String dummySourceImage = "hello-world:latest";
-        client.pullImageCmd(dummySourceImage).exec(new PullImageResultCallback()).awaitCompletion();
-
-        String dummyImageId = client.inspectImageCmd(dummySourceImage).exec().getId();
-
-        // push the image to the registry
-        client.tagImageCmd(dummyImageId, testImageName, tag).exec();
-
-        client.pushImageCmd(imageName.asCanonicalNameString())
-            .exec(new ResultCallback.Adapter<>())
-            .awaitCompletion(1, TimeUnit.MINUTES);
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        removeImage();
-    }
-
-    @Before
-    public void setUp() {
-        // Clean up local cache
-        removeImage();
-
-        LocalImagesCache.INSTANCE.cache.remove(imageName);
-    }
+    private final DockerImageName imageName = registry.createImage();
 
     @Test
     public void pullsByDefault() {
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             container.start();
         }
@@ -79,7 +36,7 @@ public void pullsByDefault() {
     public void shouldAlwaysPull() {
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             container.start();
         }
@@ -88,7 +45,7 @@ public void shouldAlwaysPull() {
 
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             expectToFailWithNotFoundException(container);
         }
@@ -99,7 +56,7 @@ public void shouldAlwaysPull() {
                 .withImagePullPolicy(PullPolicy.alwaysPull())
             // }
         ) {
-            container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.withExposedPorts(8080);
             container.start();
         }
     }
@@ -117,7 +74,7 @@ protected boolean shouldPullCached(DockerImageName imageName, ImageData localIma
                 })
             // }
         ) {
-            container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.withExposedPorts(8080);
             container.start();
         }
     }
@@ -133,7 +90,7 @@ protected boolean shouldPullCached(DockerImageName imageName, ImageData localIma
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
                 .withImagePullPolicy(policy)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             container.start();
 
@@ -169,7 +126,7 @@ private void expectToFailWithNotFoundException(GenericContainer<?> container) {
         }
     }
 
-    private static void removeImage() {
+    private void removeImage() {
         try {
             DockerClientFactory.instance().client()
                 .removeImageCmd(imageName.asCanonicalNameString())
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ sourceSets {`
`6`	`6`	`jarFileTest`
`7`	`7`	`}`
`8`	`8`
	`9`	`+test.maxParallelForks = 4`
	`10`	`+`
`9`	`11`	`idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs`
`10`	`12`
`11`	`13`	`shadowJar {`