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 ma...@apache.org on 2018/06/01 07:31:13 UTC
[1/2] james-project git commit: JAMES-2334 Add more details on
disabled test
Repository: james-project
Updated Branches:
refs/heads/master 0fdb59c41 -> a880399ab
JAMES-2334 Add more details on disabled test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/df80985d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/df80985d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/df80985d
Branch: refs/heads/master
Commit: df80985dfcd9835dbbeeaa5424eda90c7ec327ee
Parents: 0fdb59c
Author: benwa <bt...@linagora.com>
Authored: Thu May 31 17:18:04 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu May 31 17:18:04 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/df80985d/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
index d3f2cc1..b1f1f69 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
@@ -169,7 +169,8 @@ class RabbitMQClusterTest {
closeQuietly(resilientConnection, resilientChannel);
}
- @Disabled("For some reason, we are unable to recover topology when reconnecting")
+ @Disabled("JAMES-2334 For some reason, we are unable to recover topology when reconnecting" +
+ "See https://github.com/rabbitmq/rabbitmq-server/issues/959")
@Test
void nodeKillingWhenProducing(DockerRabbitMQCluster cluster) throws Exception {
resilientChannel.exchangeDeclare(EXCHANGE_NAME, DIRECT, DURABLE);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-2334 Extract a lambda in
RabbitMQCluster
Posted by ma...@apache.org.
JAMES-2334 Extract a lambda in RabbitMQCluster
This allow to give it a name and makes it more explicit
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a880399a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a880399a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a880399a
Branch: refs/heads/master
Commit: a880399ab40a9522b354e0d27f998e3c791d251b
Parents: df80985
Author: benwa <bt...@linagora.com>
Authored: Thu May 31 17:20:14 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Jun 1 09:29:56 2018 +0200
----------------------------------------------------------------------
.../james/queue/rabbitmq/RabbitMQClusterTest.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a880399a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
index b1f1f69..26cf6e1 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java
@@ -256,11 +256,7 @@ class RabbitMQClusterTest {
AtomicInteger counter = new AtomicInteger(0);
InMemoryConsumer consumer = new InMemoryConsumer(resilientChannel,
- () -> {
- if (counter.incrementAndGet() == nbMessages / 2) {
- cluster.getRabbitMQ1().stop();
- }
- });
+ () -> stopWhenHalfProcessed(cluster, nbMessages, counter));
resilientChannel.basicConsume(QUEUE, consumer);
awaitAtMostOneMinute.until(() -> consumer.getConsumedMessages().size() == nbMessages);
@@ -269,6 +265,12 @@ class RabbitMQClusterTest {
assertThat(consumer.getConsumedMessages()).containsOnlyElementsOf(expectedResult);
}
+ private void stopWhenHalfProcessed(DockerRabbitMQCluster cluster, int nbMessages, AtomicInteger counter) {
+ if (counter.incrementAndGet() == nbMessages / 2) {
+ cluster.getRabbitMQ1().stop();
+ }
+ }
+
}
private void closeQuietly(AutoCloseable... closeables) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org