You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/08/22 15:59:27 UTC
[james-project] branch master updated (b26a9d82ee -> 2bd2b4a344)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from b26a9d82ee JAMES-3774 MPT tests should rely on CassandraClusterExtension
new bdc4c96f54 JAMES-3775 FeedHamToRSpamDTaskTest is unstable
new 726ae0fbbb JAMES-3775 ClamAV: avoid starting freshClam
new 2fc87ff3f0 JAMES-3775 Start ClamAV and Redis in parallel
new 3dd9da31b5 JAMES-3775 Start RSpamD once for all test class
new 2bd2b4a344 JAMES-3775 Cosmetic fix
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/james/rspamd/DockerClamAV.java | 10 ++--------
.../java/org/apache/james/rspamd/DockerRSpamD.java | 18 ++++++++++--------
.../org/apache/james/rspamd/DockerRSpamDExtension.java | 11 ++++-------
.../apache/james/rspamd/DockerRSpamDExtensionTest.java | 2 +-
.../james/rspamd/task/FeedHamToRSpamDTaskTest.java | 3 +++
5 files changed, 20 insertions(+), 24 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 03/05: JAMES-3775 Start ClamAV and Redis in parallel
Posted by bt...@apache.org.
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
commit 2fc87ff3f0272730cb124294463a7087be5c00f5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Aug 22 09:35:59 2022 +0700
JAMES-3775 Start ClamAV and Redis in parallel
---
.../src/test/java/org/apache/james/rspamd/DockerRSpamD.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
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 864eaf0bc8..d21cdb86c2 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,6 +19,8 @@
package org.apache.james.rspamd;
+import java.util.stream.Stream;
+
import org.apache.james.rate.limiter.DockerRedis;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
@@ -59,8 +61,10 @@ public class DockerRSpamD {
}
public void start() {
- dockerClamAV.start();
- dockerRedis.start();
+ Stream.<Runnable>of(dockerClamAV::start, dockerRedis::start)
+ .parallel()
+ .forEach(Runnable::run);
+
if (!container.isRunning()) {
container.start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 04/05: JAMES-3775 Start RSpamD once for all test class
Posted by bt...@apache.org.
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
commit 3dd9da31b50fada4620bb37e95148c5d8de48fb3
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Aug 22 09:36:24 2022 +0700
JAMES-3775 Start RSpamD once for all test class
---
.../src/test/java/org/apache/james/rspamd/DockerClamAV.java | 8 --------
.../src/test/java/org/apache/james/rspamd/DockerRSpamD.java | 10 ++++------
.../java/org/apache/james/rspamd/DockerRSpamDExtension.java | 11 ++++-------
3 files changed, 8 insertions(+), 21 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 3bf5ca4562..d251e91eaf 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
@@ -39,17 +39,9 @@ public class DockerClamAV {
.withNetworkAliases("clamav");
}
- public Integer getPort() {
- return container.getMappedPort(DEFAULT_PORT);
- }
-
public void start() {
if (!container.isRunning()) {
container.start();
}
}
-
- public void stop() {
- container.stop();
- }
}
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 d21cdb86c2..73d694c127 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
@@ -45,6 +45,10 @@ public class DockerRSpamD {
this.container = createRspamD();
}
+ public boolean isRunning() {
+ return container.isRunning();
+ }
+
private GenericContainer<?> createRspamD() {
return new GenericContainer<>(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG))
.withExposedPorts(DEFAULT_PORT)
@@ -70,12 +74,6 @@ public class DockerRSpamD {
}
}
- public void stop() {
- container.stop();
- dockerRedis.stop();
- dockerClamAV.stop();
- }
-
public void flushAll() {
dockerRedis.flushAll();
}
diff --git a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtension.java b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtension.java
index 47fe2b74b5..4d514e0d58 100644
--- a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtension.java
+++ b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtension.java
@@ -32,16 +32,13 @@ public class DockerRSpamDExtension implements GuiceModuleTestExtension {
@Override
public void beforeAll(ExtensionContext extensionContext) {
- DOCKER_RSPAMD_SINGLETON.start();
- }
-
- @Override
- public void afterAll(ExtensionContext extensionContext) {
- DOCKER_RSPAMD_SINGLETON.stop();
+ if (!DOCKER_RSPAMD_SINGLETON.isRunning()) {
+ DOCKER_RSPAMD_SINGLETON.start();
+ }
}
@Override
- public void beforeEach(ExtensionContext extensionContext) throws Exception {
+ public void beforeEach(ExtensionContext extensionContext) {
DOCKER_RSPAMD_SINGLETON.flushAll();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/05: JAMES-3775 FeedHamToRSpamDTaskTest is unstable
Posted by bt...@apache.org.
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
commit bdc4c96f54bbd9b509d7e729506c749c6c5e868d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Aug 22 09:34:27 2022 +0700
JAMES-3775 FeedHamToRSpamDTaskTest is unstable
Test score stability is not granted
---
.../java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java b/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java
index c5905d809b..5d4b62f0bc 100644
--- a/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java
+++ b/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java
@@ -41,6 +41,7 @@ import javax.mail.Flags;
import org.apache.james.core.Domain;
import org.apache.james.core.Username;
import org.apache.james.domainlist.api.DomainList;
+import org.apache.james.junit.categories.Unstable;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.exception.MailboxException;
@@ -57,13 +58,15 @@ import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.utils.UpdatableTickingClock;
import org.assertj.core.api.SoftAssertions;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mockito;
import com.github.fge.lambdas.Throwing;
-public class FeedHamToRSpamDTaskTest {
+@Tag(Unstable.TAG)
+class FeedHamToRSpamDTaskTest {
@RegisterExtension
static DockerRSpamDExtension rSpamDExtension = new DockerRSpamDExtension();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/05: JAMES-3775 ClamAV: avoid starting freshClam
Posted by bt...@apache.org.
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
commit 726ae0fbbb812a6f8e22602beda29cedeb4f5137
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Aug 22 09:35:14 2022 +0700
JAMES-3775 ClamAV: avoid starting freshClam
---
.../rspamd/src/test/java/org/apache/james/rspamd/DockerClamAV.java | 2 ++
1 file changed, 2 insertions(+)
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 7fdf946dd7..3bf5ca4562 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
@@ -33,6 +33,8 @@ public class DockerClamAV {
public DockerClamAV(Network network) {
this.container = new GenericContainer<>(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG))
.withExposedPorts(DEFAULT_PORT)
+ .withEnv("CLAMAV_NO_FRESHCLAMD", "true")
+ .withEnv("CLAMAV_NO_MILTERD", "true")
.withNetwork(network)
.withNetworkAliases("clamav");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 05/05: JAMES-3775 Cosmetic fix
Posted by bt...@apache.org.
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
commit 2bd2b4a3444b669784e4249a5e74146e05335984
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Aug 22 09:38:12 2022 +0700
JAMES-3775 Cosmetic fix
---
.../test/java/org/apache/james/rspamd/DockerRSpamDExtensionTest.java | 2 +-
.../test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtensionTest.java b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtensionTest.java
index 538f04d3a3..1d53ebdf99 100644
--- a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtensionTest.java
+++ b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerRSpamDExtensionTest.java
@@ -39,7 +39,7 @@ import io.restassured.http.Header;
import io.restassured.specification.RequestSpecification;
@Tag(Unstable.TAG)
-public class DockerRSpamDExtensionTest {
+class DockerRSpamDExtensionTest {
@RegisterExtension
static DockerRSpamDExtension rSpamDExtension = new DockerRSpamDExtension();
diff --git a/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java b/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java
index 5d4b62f0bc..3d7204a6ae 100644
--- a/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java
+++ b/third-party/rspamd/src/test/java/org/apache/james/rspamd/task/FeedHamToRSpamDTaskTest.java
@@ -66,7 +66,7 @@ import org.mockito.Mockito;
import com.github.fge.lambdas.Throwing;
@Tag(Unstable.TAG)
-class FeedHamToRSpamDTaskTest {
+public class FeedHamToRSpamDTaskTest {
@RegisterExtension
static DockerRSpamDExtension rSpamDExtension = new DockerRSpamDExtension();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org