You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2019/06/21 13:30:47 UTC

[james-project] branch master updated: JAMES-2802 Improve ES container methods semantic

This is an automated email from the ASF dual-hosted git repository.

rouazana 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 c9ebb98  JAMES-2802 Improve ES container methods semantic
c9ebb98 is described below

commit c9ebb980866615a472d9dfb07b232e994a03fb3e
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Jun 18 18:06:42 2019 +0200

    JAMES-2802 Improve ES container methods semantic
    
            Throw a IllegalStateException when flush fails and be honest
            about the fact we flush indices (and nothing in elasticsearch doc
            says that it make anything more synchronous)
    
            Also throw IllegalStateException when cleanup fails
---
 .../org/apache/james/backends/es/DockerElasticSearch.java    | 12 +++++++-----
 .../apache/james/backends/es/DockerElasticSearchRule.java    |  2 +-
 .../ElasticSearchQuotaSearchTestSystemExtension.java         |  2 +-
 .../elasticsearch/host/ElasticSearchHostSystem.java          |  2 +-
 .../java/org/apache/james/DockerElasticSearchExtension.java  |  2 +-
 .../test/java/org/apache/james/DockerElasticSearchRule.java  |  2 +-
 .../apache/james/metric/es/DockerElasticSearchExtension.java |  2 +-
 .../james/jmap/cassandra/cucumber/CassandraStepdefs.java     |  2 +-
 .../jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java  |  2 +-
 .../webadmin/routes/ElasticSearchQuotaSearchExtension.java   |  2 +-
 10 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java
index 518aab4..e2d5f78 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java
@@ -105,13 +105,15 @@ public class DockerElasticSearch {
     }
 
     public void cleanUpData() {
-        assertThat(esAPI().deleteAllIndexes().status())
-            .isEqualTo(HttpStatus.SC_OK);
+        if (esAPI().deleteAllIndexes().status() != HttpStatus.SC_OK) {
+            throw new IllegalStateException("Failed to delete all data from ElasticSearch");
+        }
     }
 
-    public void awaitForElasticSearch() {
-        assertThat(esAPI().flush().status())
-            .isEqualTo(HttpStatus.SC_OK);
+    public void flushIndices() {
+        if (esAPI().flush().status() != HttpStatus.SC_OK) {
+            throw new IllegalStateException("Failed to flush ElasticSearch");
+        }
     }
 
     public ClientProvider clientProvider() {
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java
index 094c2ba..89233a1 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java
@@ -40,7 +40,7 @@ public class DockerElasticSearchRule extends ExternalResource {
     }
     
     public void awaitForElasticSearch() {
-        dockerElasticSearch.awaitForElasticSearch();
+        dockerElasticSearch.flushIndices();
     }
 
     public DockerElasticSearch getDockerElasticSearch() {
diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
index d4bc928..55dbf0b 100644
--- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
+++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
@@ -86,7 +86,7 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes
                 usersRepository,
                 domainList,
                 resources.getCurrentQuotaManager(),
-                elasticSearch::awaitForElasticSearch);
+                elasticSearch::flushIndices);
         } catch (Exception e) {
             throw new ParameterResolutionException("Error while resolving parameter", e);
         }
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
index 443706e..e0f3b92 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
@@ -134,6 +134,6 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem {
 
     @Override
     protected void await() {
-        dockerElasticSearch.awaitForElasticSearch();
+        dockerElasticSearch.flushIndices();
     }
 }
\ No newline at end of file
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java
index 47210f8..531bf13 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java
@@ -55,7 +55,7 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension {
 
     @Override
     public void await() {
-        getDockerES().awaitForElasticSearch();
+        getDockerES().flushIndices();
     }
 
     private ElasticSearchConfiguration getElasticSearchConfigurationForDocker() {
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
index fed09ce..18d0ad8 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
@@ -39,7 +39,7 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {
 
     @Override
     public void await() {
-        elasticSearch.awaitForElasticSearch();
+        elasticSearch.flushIndices();
     }
 
     @Override
diff --git a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java
index 1a8698b..cfedbc0 100644
--- a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java
+++ b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java
@@ -45,7 +45,7 @@ public class DockerElasticSearchExtension implements AfterAllCallback, BeforeAll
 
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
-        elasticSearch.awaitForElasticSearch();
+        elasticSearch.flushIndices();
     }
 
     @Override
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
index 416106b..39c45cf 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
@@ -86,7 +86,7 @@ public class CassandraStepdefs {
             .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class))
             .overrideWith(binder -> Multibinder.newSetBinder(binder, CleanupTasksPerformer.CleanupTask.class).addBinding().to(CassandraTruncateTableTask.class))
             .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton()));
-        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().awaitForElasticSearch();
+        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().flushIndices();
         mainStepdefs.init();
     }
 
diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
index 9241c6b..cca6f72 100644
--- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
+++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
@@ -95,7 +95,7 @@ public class RabbitMQAwsS3Stepdefs {
                 .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class))
                 .overrideWith(binder -> Multibinder.newSetBinder(binder, CleanupTasksPerformer.CleanupTask.class).addBinding().to(CassandraTruncateTableTask.class))
                 .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton()));
-        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().awaitForElasticSearch();
+        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().flushIndices();
         mainStepdefs.init();
     }
 
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
index 3223b99..f062b60 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
@@ -89,7 +89,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
                 usersRepository,
                 domainList,
                 resources.getCurrentQuotaManager(),
-                elasticSearch::awaitForElasticSearch);
+                elasticSearch::flushIndices);
 
             restQuotaSearchTestSystem = new WebAdminQuotaSearchTestSystem(quotaSearchTestSystem);
         } catch (Exception e) {


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Re: [james-project] branch master updated: JAMES-2802 Improve ES container methods semantic

Posted by jackie issa <ja...@hotmail.com>.
Get Outlook for iOS<https://aka.ms/o0ukef>
________________________________
From: rouazana@apache.org <ro...@apache.org>
Sent: Friday, June 21, 2019 4:30:47 PM
To: server-dev@james.apache.org
Subject: [james-project] branch master updated: JAMES-2802 Improve ES container methods semantic

This is an automated email from the ASF dual-hosted git repository.

rouazana 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 c9ebb98  JAMES-2802 Improve ES container methods semantic
c9ebb98 is described below

commit c9ebb980866615a472d9dfb07b232e994a03fb3e
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Jun 18 18:06:42 2019 +0200

    JAMES-2802 Improve ES container methods semantic

            Throw a IllegalStateException when flush fails and be honest
            about the fact we flush indices (and nothing in elasticsearch doc
            says that it make anything more synchronous)

            Also throw IllegalStateException when cleanup fails
---
 .../org/apache/james/backends/es/DockerElasticSearch.java    | 12 +++++++-----
 .../apache/james/backends/es/DockerElasticSearchRule.java    |  2 +-
 .../ElasticSearchQuotaSearchTestSystemExtension.java         |  2 +-
 .../elasticsearch/host/ElasticSearchHostSystem.java          |  2 +-
 .../java/org/apache/james/DockerElasticSearchExtension.java  |  2 +-
 .../test/java/org/apache/james/DockerElasticSearchRule.java  |  2 +-
 .../apache/james/metric/es/DockerElasticSearchExtension.java |  2 +-
 .../james/jmap/cassandra/cucumber/CassandraStepdefs.java     |  2 +-
 .../jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java  |  2 +-
 .../webadmin/routes/ElasticSearchQuotaSearchExtension.java   |  2 +-
 10 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java
index 518aab4..e2d5f78 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java
@@ -105,13 +105,15 @@ public class DockerElasticSearch {
     }

     public void cleanUpData() {
-        assertThat(esAPI().deleteAllIndexes().status())
-            .isEqualTo(HttpStatus.SC_OK);
+        if (esAPI().deleteAllIndexes().status() != HttpStatus.SC_OK) {
+            throw new IllegalStateException("Failed to delete all data from ElasticSearch");
+        }
     }

-    public void awaitForElasticSearch() {
-        assertThat(esAPI().flush().status())
-            .isEqualTo(HttpStatus.SC_OK);
+    public void flushIndices() {
+        if (esAPI().flush().status() != HttpStatus.SC_OK) {
+            throw new IllegalStateException("Failed to flush ElasticSearch");
+        }
     }

     public ClientProvider clientProvider() {
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java
index 094c2ba..89233a1 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearchRule.java
@@ -40,7 +40,7 @@ public class DockerElasticSearchRule extends ExternalResource {
     }

     public void awaitForElasticSearch() {
-        dockerElasticSearch.awaitForElasticSearch();
+        dockerElasticSearch.flushIndices();
     }

     public DockerElasticSearch getDockerElasticSearch() {
diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
index d4bc928..55dbf0b 100644
--- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
+++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
@@ -86,7 +86,7 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes
                 usersRepository,
                 domainList,
                 resources.getCurrentQuotaManager(),
-                elasticSearch::awaitForElasticSearch);
+                elasticSearch::flushIndices);
         } catch (Exception e) {
             throw new ParameterResolutionException("Error while resolving parameter", e);
         }
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
index 443706e..e0f3b92 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
@@ -134,6 +134,6 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem {

     @Override
     protected void await() {
-        dockerElasticSearch.awaitForElasticSearch();
+        dockerElasticSearch.flushIndices();
     }
 }
\ No newline at end of file
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java
index 47210f8..531bf13 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java
@@ -55,7 +55,7 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension {

     @Override
     public void await() {
-        getDockerES().awaitForElasticSearch();
+        getDockerES().flushIndices();
     }

     private ElasticSearchConfiguration getElasticSearchConfigurationForDocker() {
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
index fed09ce..18d0ad8 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
@@ -39,7 +39,7 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {

     @Override
     public void await() {
-        elasticSearch.awaitForElasticSearch();
+        elasticSearch.flushIndices();
     }

     @Override
diff --git a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java
index 1a8698b..cfedbc0 100644
--- a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java
+++ b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearchExtension.java
@@ -45,7 +45,7 @@ public class DockerElasticSearchExtension implements AfterAllCallback, BeforeAll

     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
-        elasticSearch.awaitForElasticSearch();
+        elasticSearch.flushIndices();
     }

     @Override
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
index 416106b..39c45cf 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
@@ -86,7 +86,7 @@ public class CassandraStepdefs {
             .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class))
             .overrideWith(binder -> Multibinder.newSetBinder(binder, CleanupTasksPerformer.CleanupTask.class).addBinding().to(CassandraTruncateTableTask.class))
             .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton()));
-        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().awaitForElasticSearch();
+        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().flushIndices();
         mainStepdefs.init();
     }

diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
index 9241c6b..cca6f72 100644
--- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
+++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
@@ -95,7 +95,7 @@ public class RabbitMQAwsS3Stepdefs {
                 .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class))
                 .overrideWith(binder -> Multibinder.newSetBinder(binder, CleanupTasksPerformer.CleanupTask.class).addBinding().to(CassandraTruncateTableTask.class))
                 .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton()));
-        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().awaitForElasticSearch();
+        mainStepdefs.awaitMethod = () -> elasticSearch.getDockerEs().flushIndices();
         mainStepdefs.init();
     }

diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
index 3223b99..f062b60 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
@@ -89,7 +89,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
                 usersRepository,
                 domainList,
                 resources.getCurrentQuotaManager(),
-                elasticSearch::awaitForElasticSearch);
+                elasticSearch::flushIndices);

             restQuotaSearchTestSystem = new WebAdminQuotaSearchTestSystem(quotaSearchTestSystem);
         } catch (Exception e) {


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org