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 1fe4f82507da7c2611232c425c411b85addeb4c4
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Fri Jun 24 16:58:09 2022 +0700
JAMES-3771 DockerElasticSearchExtension should cleanup its data after each
test
---
.../java/org/apache/james/DockerOpenSearchExtension.java | 13 +++++++------
.../apache/james/JamesServerWithRetryConnectionTest.java | 4 ++--
.../java/org/apache/james/DockerOpenSearchExtension.java | 13 +++++++------
.../RabbitMQReindexingWithEventDeadLettersTest.java | 4 ++--
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git
a/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchExtension.java
b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchExtension.java
index c9114ef5c3..3dceac582b 100644
---
a/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchExtension.java
+++
b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchExtension.java
@@ -50,19 +50,20 @@ public class DockerOpenSearchExtension implements
GuiceModuleTestExtension {
@Override
public void beforeAll(ExtensionContext extensionContext) {
- getDockerES().start();
+ getDockerOS().start();
}
@Override
public void beforeEach(ExtensionContext extensionContext) {
- if (!getDockerES().isRunning()) {
- getDockerES().unpause();
+ if (!getDockerOS().isRunning()) {
+ getDockerOS().unpause();
}
await();
}
@Override
public void afterEach(ExtensionContext extensionContext) {
+ getDockerOS().cleanUpData();
}
@Override
@@ -73,17 +74,17 @@ public class DockerOpenSearchExtension implements
GuiceModuleTestExtension {
@Override
public void await() {
- getDockerES().flushIndices();
+ getDockerOS().flushIndices();
}
private OpenSearchConfiguration getOpenSearchConfigurationForDocker() {
return OpenSearchConfiguration.builder()
- .addHost(getDockerES().getHttpHost())
+ .addHost(getDockerOS().getHttpHost())
.requestTimeout(requestTimeout)
.build();
}
- public DockerOpenSearch getDockerES() {
+ public DockerOpenSearch getDockerOS() {
return dockerOpenSearch;
}
}
diff --git
a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
index bcea7a3b67..f5afa48acb 100644
---
a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
+++
b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
@@ -86,9 +86,9 @@ class JamesServerWithRetryConnectionTest {
@Test
void
serverShouldRetryToConnectToOpenSearchWhenStartService(GuiceJamesServer server)
throws Exception {
- dockerOpenSearch.getDockerES().pause();
+ dockerOpenSearch.getDockerOS().pause();
- waitToStartContainer(WAITING_TIME,
dockerOpenSearch.getDockerES()::unpause);
+ waitToStartContainer(WAITING_TIME,
dockerOpenSearch.getDockerOS()::unpause);
assertThatServerStartCorrectly(server);
}
diff --git
a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerOpenSearchExtension.java
b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerOpenSearchExtension.java
index c9114ef5c3..3dceac582b 100644
---
a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerOpenSearchExtension.java
+++
b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerOpenSearchExtension.java
@@ -50,19 +50,20 @@ public class DockerOpenSearchExtension implements
GuiceModuleTestExtension {
@Override
public void beforeAll(ExtensionContext extensionContext) {
- getDockerES().start();
+ getDockerOS().start();
}
@Override
public void beforeEach(ExtensionContext extensionContext) {
- if (!getDockerES().isRunning()) {
- getDockerES().unpause();
+ if (!getDockerOS().isRunning()) {
+ getDockerOS().unpause();
}
await();
}
@Override
public void afterEach(ExtensionContext extensionContext) {
+ getDockerOS().cleanUpData();
}
@Override
@@ -73,17 +74,17 @@ public class DockerOpenSearchExtension implements
GuiceModuleTestExtension {
@Override
public void await() {
- getDockerES().flushIndices();
+ getDockerOS().flushIndices();
}
private OpenSearchConfiguration getOpenSearchConfigurationForDocker() {
return OpenSearchConfiguration.builder()
- .addHost(getDockerES().getHttpHost())
+ .addHost(getDockerOS().getHttpHost())
.requestTimeout(requestTimeout)
.build();
}
- public DockerOpenSearch getDockerES() {
+ public DockerOpenSearch getDockerOS() {
return dockerOpenSearch;
}
}
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
index 7be41f7073..360c40128b 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
@@ -125,7 +125,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
aliceAccessToken =
authenticateJamesUser(LocalHostURIBuilder.baseUri(jmapPort), ALICE,
ALICE_PASSWORD);
- dockerOpenSearch.getDockerES().pause();
+ dockerOpenSearch.getDockerOS().pause();
Thread.sleep(Duration.ofSeconds(2).toMillis()); // Docker pause is
asynchronous and we found no way to poll for it
}
@@ -153,7 +153,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
}
private void unpauseOpenSearch() throws Exception {
- dockerOpenSearch.getDockerES().unpause();
+ dockerOpenSearch.getDockerOS().unpause();
Thread.sleep(Duration.ofSeconds(2).toMillis()); // Docker unpause is
asynchronous and we found no way to poll for it
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
