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 24fd2c4a40e19b8447e556a29a5fe021abcbe272 Author: Benoit Tellier <[email protected]> AuthorDate: Tue May 12 11:13:41 2020 +0700 JAMES-3140 Relocate Cassandra backend cassandra.properties file This file was used for testing parsing and was fed with meaningless values. However integration tests were relying on it instead of Cassandra configuration defaults, leading to '2' retries only being performed upon concurrent modseq generation. Note that this is actually the cause of random failure within MailsShouldBeWellReceived::oneHundredMailsShouldBeWellReceived --- .../backends/cassandra/init/CassandraConfigurationReadingTest.java | 2 +- .../test/resources/{ => configuration-reader-test}/cassandra.properties | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationReadingTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationReadingTest.java index da60e9b..a6f5995 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationReadingTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationReadingTest.java @@ -43,7 +43,7 @@ class CassandraConfigurationReadingTest { FileBasedConfigurationBuilder<FileBasedConfiguration> builder = new FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration.class) .configure(new Parameters() .fileBased() - .setURL(ClassLoader.getSystemResource("cassandra.properties"))); + .setURL(ClassLoader.getSystemResource("configuration-reader-test/cassandra.properties"))); CassandraConfiguration configuration = CassandraConfiguration.from(builder.getConfiguration()); diff --git a/backends-common/cassandra/src/test/resources/cassandra.properties b/backends-common/cassandra/src/test/resources/configuration-reader-test/cassandra.properties similarity index 100% rename from backends-common/cassandra/src/test/resources/cassandra.properties rename to backends-common/cassandra/src/test/resources/configuration-reader-test/cassandra.properties --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
