This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new a4867def74 JAMES-3775 Add Wait for healthcheck to ClaimAV/RspamD
extension (#1630)
a4867def74 is described below
commit a4867def7468067f69bf12039f6c6f74518d7426
Author: vttran <[email protected]>
AuthorDate: Thu Jul 6 22:33:50 2023 +0700
JAMES-3775 Add Wait for healthcheck to ClaimAV/RspamD extension (#1630)
---
.../src/test/java/org/apache/james/rspamd/DockerClamAV.java | 8 ++++++--
.../src/test/java/org/apache/james/rspamd/DockerRspamd.java | 7 +++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git
a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerClamAV.java
b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerClamAV.java
index 3020e4cfb8..fcc772e62b 100644
--- a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerClamAV.java
+++ b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerClamAV.java
@@ -21,8 +21,11 @@ package org.apache.james.rspamd;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.DockerImageName;
+import java.util.UUID;
+
public class DockerClamAV {
private static final DockerImageName DEFAULT_IMAGE_NAME =
DockerImageName.parse("clamav/clamav");
private static final String DEFAULT_TAG = "0.105";
@@ -36,8 +39,9 @@ public class DockerClamAV {
.withEnv("CLAMAV_NO_FRESHCLAMD", "true")
.withEnv("CLAMAV_NO_MILTERD", "true")
.withNetwork(network)
- .withCreateContainerCmdModifier(createContainerCmd ->
createContainerCmd.withName("james-clamav-test"))
- .withNetworkAliases("clamav");
+ .withCreateContainerCmdModifier(createContainerCmd ->
createContainerCmd.withName("james-clamav-test-" + UUID.randomUUID()))
+ .withNetworkAliases("clamav")
+ .waitingFor(Wait.forHealthcheck());
}
public void start() {
diff --git
a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRspamd.java
b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRspamd.java
index dd379b8c46..2896ecf806 100644
--- a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRspamd.java
+++ b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRspamd.java
@@ -19,11 +19,13 @@
package org.apache.james.rspamd;
+import java.util.UUID;
import java.util.stream.Stream;
import org.apache.james.rate.limiter.DockerRedis;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
@@ -58,8 +60,9 @@ public class DockerRspamd {
.withCopyFileToContainer(MountableFile.forClasspathResource("rspamd-config/antivirus.conf"),
"/etc/rspamd/override.d/")
.withCopyFileToContainer(MountableFile.forClasspathResource("rspamd-config/actions.conf"),
"/etc/rspamd/")
.withCopyFileToContainer(MountableFile.forClasspathResource("rspamd-config/statistic.conf"),
"/etc/rspamd/")
- .withCreateContainerCmdModifier(createContainerCmd ->
createContainerCmd.withName("james-rspamd-test"))
- .withNetwork(network);
+ .withCreateContainerCmdModifier(createContainerCmd ->
createContainerCmd.withName("james-rspamd-test-" + UUID.randomUUID()))
+ .withNetwork(network)
+ .waitingFor(Wait.forHealthcheck());
}
public Integer getPort() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
