This is an automated email from the ASF dual-hosted git repository. quantranhong1999 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 021fd372629ade2a277e1e7ead00fa2c78d84ada Author: Benoit TELLIER <[email protected]> AuthorDate: Thu Sep 17 14:45:19 2026 +0200 [BUILD] Webadmin integration tests: improve PG lifecycle --- .../postgres-webadmin-integration-test/pom.xml | 4 ++++ ...bitMQPostgresDeletedMessageVaultIntegrationTest.java | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/pom.xml index 7adc5557bb..c39f288fbd 100644 --- a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/pom.xml @@ -111,7 +111,11 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>-Djava.library.path= + -javaagent:"${settings.localRepository}"/org/jacoco/org.jacoco.agent/${jacoco-maven-plugin.version}/org.jacoco.agent-${jacoco-maven-plugin.version}-runtime.jar=destfile=${basedir}/target/jacoco.exec + -Xms1024m -Xmx4096m</argLine> <reuseForks>true</reuseForks> + <forkCount>2</forkCount> <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> </configuration> </plugin> diff --git a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/vault/RabbitMQPostgresDeletedMessageVaultIntegrationTest.java b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/vault/RabbitMQPostgresDeletedMessageVaultIntegrationTest.java index 11cd50c202..9256f56b1b 100644 --- a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/vault/RabbitMQPostgresDeletedMessageVaultIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/vault/RabbitMQPostgresDeletedMessageVaultIntegrationTest.java @@ -32,9 +32,26 @@ import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.blobstore.BlobStoreConfiguration; import org.apache.james.vault.VaultConfiguration; import org.apache.james.webadmin.integration.probe.DeletedMessageVaultProbeModule; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.RegisterExtension; +// The full contract is covered by PostgresDeletedMessageVaultIntegrationTest: only check the vault works with the RabbitMQ event bus +@ExtendWith(RabbitMQPostgresDeletedMessageVaultIntegrationTest.BasicTestOnly.class) class RabbitMQPostgresDeletedMessageVaultIntegrationTest extends DeletedMessageVaultIntegrationTest { + static class BasicTestOnly implements ExecutionCondition { + private static final String BASIC_TEST = "vaultEndpointShouldRestoreJmapDeletedEmail"; + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + return context.getTestMethod() + .filter(method -> !method.getName().equals(BASIC_TEST)) + .map(method -> ConditionEvaluationResult.disabled("Covered by PostgresDeletedMessageVaultIntegrationTest")) + .orElse(ConditionEvaluationResult.enabled("Basic vault test")); + } + } @RegisterExtension static RabbitMQExtension rabbitMQExtension = new RabbitMQExtension(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
