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 bt...@apache.org on 2018/10/04 09:32:31 UTC
james-project git commit: Fix merge conflict
Repository: james-project
Updated Branches:
refs/heads/master 2bf850aed -> 76900c276
Fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/76900c27
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/76900c27
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/76900c27
Branch: refs/heads/master
Commit: 76900c276c9b8b3a7d555af43f626c2b3c1feb8a
Parents: 2bf850a
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Oct 4 15:46:07 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Thu Oct 4 16:30:16 2018 +0700
----------------------------------------------------------------------
.../james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/76900c27/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java
index fc85f0c..6c38d25 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java
@@ -25,9 +25,9 @@ import static org.mockito.Mockito.mock;
import java.net.URISyntaxException;
import java.time.Clock;
+import java.time.Duration;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
import javax.mail.internet.MimeMessage;
@@ -88,12 +88,11 @@ class RabbitMqMailQueueFactoryTest implements MailQueueFactoryContract<RabbitMQM
Set<RabbitMQMailQueue> createdRabbitMQMailQueues = ConcurrentHashMap.newKeySet();
ConcurrentTestRunner.builder()
+ .operation((threadNumber, operationNumber) ->
+ createdRabbitMQMailQueues.add(mailQueueFactory.createQueue("spool")))
.threadCount(100)
.operationCount(10)
- .build((threadNumber, operationNumber) ->
- createdRabbitMQMailQueues.add(mailQueueFactory.createQueue("spool")))
- .run()
- .awaitTermination(10, TimeUnit.MINUTES);
+ .runSuccessfullyWithin(Duration.ofMinutes(10));
assertThat(mailQueueFactory.listCreatedMailQueues())
.hasSize(1)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org