This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2adacf4d3e6209b5f340c5421d2c7a28439948ed Author: Benoit Tellier <[email protected]> AuthorDate: Mon Oct 19 14:44:59 2020 +0700 JAMES-3350 Significantly fasten Cassandra backend integration tests There was a timeout connecting the ES metrics reporter causing execution of a single test taking 2 minutes instead of 53 seconds --- .../src/test/java/org/apache/james/CassandraJmapTestRule.java | 2 -- .../test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java | 2 -- .../org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java | 2 -- .../james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 2 -- 4 files changed, 8 deletions(-) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java index 6a34304..bb744a2 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java @@ -21,7 +21,6 @@ package org.apache.james; import java.io.IOException; -import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.rules.TemporaryFolder; @@ -62,7 +61,6 @@ public class CassandraJmapTestRule implements TestRule { return CassandraJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) - .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)) diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java index 6b86dbf..c553a01 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java @@ -22,7 +22,6 @@ package org.apache.james; import java.io.IOException; import org.apache.james.backends.rabbitmq.DockerRabbitMQSingleton; -import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.TestRabbitMQModule; import org.apache.james.modules.blobstore.BlobStoreConfiguration; @@ -73,7 +72,6 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule { .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(new DockerAwsS3TestRule().getModule()) .overrideWith(new TestJMAPServerModule()) - .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)) diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java index a9fdcab..7638f4f 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java @@ -36,7 +36,6 @@ import org.apache.james.jmap.draft.methods.integration.cucumber.MainStepdefs; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.server.CassandraTruncateTableTask; import org.junit.rules.TemporaryFolder; @@ -78,7 +77,6 @@ public class CassandraStepdefs { mainStepdefs.jmapServer = CassandraJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) - .overrideWith(new TestDockerESMetricReporterModule(elasticSearch.getDockerEs().getHttpHost())) .overrideWith(elasticSearch.getModule()) .overrideWith(cassandraServer.getModule()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(DefaultTextExtractor.class)) diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java index c549a76..cb4eefe 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java @@ -33,7 +33,6 @@ import org.apache.james.jmap.draft.methods.integration.cucumber.ImapStepdefs; import org.apache.james.jmap.draft.methods.integration.cucumber.MainStepdefs; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.modules.DockerRabbitMQRule; -import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.TestRabbitMQModule; import org.apache.james.modules.blobstore.BlobStoreConfiguration; @@ -86,7 +85,6 @@ public class RabbitMQAwsS3Stepdefs { mainStepdefs.jmapServer = CassandraRabbitMQJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) - .overrideWith(new TestDockerESMetricReporterModule(elasticSearch.getDockerEs().getHttpHost())) .overrideWith(new TestRabbitMQModule(rabbitMQServer.dockerRabbitMQ())) .overrideWith(awsS3Server.getModule()) .overrideWith(elasticSearch.getModule()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
