This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 649794f10374a2d8c19e7977d77ec30e3a14cde5 Author: Jean Helou <[email protected]> AuthorDate: Tue Jan 26 10:59:05 2021 +0100 JAMES-3225 use unique cassandra image names Uses unique cassandra image names to let tests run concurrently against the docker cache Activates delete on exit since images are no longer used more than once Note however that the singleton behaviour that runs multiple tests against a single cassandra container before recreating a container is still in place. --- .../java/org/apache/james/backends/cassandra/DockerCassandra.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java index 2ef8b92..fce5fc0 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java @@ -38,6 +38,8 @@ import com.datastax.driver.core.Session; import com.github.dockerjava.api.DockerClient; import com.google.common.collect.ImmutableMap; +import java.util.UUID; + public class DockerCassandra { /** @@ -118,7 +120,7 @@ public class DockerCassandra { @SuppressWarnings("resource") public DockerCassandra() { - this("cassandra_3_11_3", AdditionalDockerFileStep.IDENTITY); + this("cassandra_3_11_3-"+ UUID.randomUUID().toString(), AdditionalDockerFileStep.IDENTITY); } public DockerCassandra(String imageName, AdditionalDockerFileStep additionalSteps) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
