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/01 02:05:28 UTC
[1/4] james-project git commit: use untilAsserted instead of until +
exception catching
Repository: james-project
Updated Branches:
refs/heads/master e4f13e47f -> 436e8cde4
use untilAsserted instead of until + exception catching
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/843a4c21
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/843a4c21
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/843a4c21
Branch: refs/heads/master
Commit: 843a4c2157db69037e7979f6b18045d73d9c32c5
Parents: e4f13e4
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Sep 28 15:54:24 2018 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Sep 28 15:54:24 2018 +0200
----------------------------------------------------------------------
.../org/apache/james/mpt/smtp/ForwardSmtpTest.java | 4 ++--
...ectResolutionRemoteDeliveryIntegrationTest.java | 8 ++++----
.../GatewayRemoteDeliveryIntegrationTest.java | 15 +++++++--------
.../james/smtp/SmtpAuthorizedAddressesTest.java | 4 ++--
.../transport/mailets/GroupMappingRelayTest.java | 2 +-
.../james/jmap/VacationRelayIntegrationTest.java | 4 ++--
.../main/java/org/apache/james/utils/FakeSmtp.java | 17 ++++++-----------
7 files changed, 24 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/843a4c21/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index d6bffc8..430f3f8 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -78,8 +78,8 @@ public abstract class ForwardSmtpTest {
public void forwardingAnEmailShouldWork() throws Exception {
scriptedTest.run("helo");
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- fakeSmtp.isReceived(response -> response
+ calmlyAwait.atMost(ONE_MINUTE).untilAsserted(() ->
+ fakeSmtp.assertEmailReceived(response -> response
.body("[0].from", equalTo("matthieu@yopmail.com"))
.body("[0].subject", equalTo("test"))
.body("[0].text", equalTo("content"))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/843a4c21/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
index 88f5617..ef36921 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
@@ -120,7 +120,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
awaitAtMostOneMinute
.pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
- .until(this::messageIsReceivedByTheSmtpServer);
+ .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@Test
@@ -149,7 +149,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
awaitAtMostOneMinute
.pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
- .until(this::messageIsReceivedByTheSmtpServer);
+ .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@Test
@@ -208,8 +208,8 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
.awaitMessage(awaitAtMostOneMinute);
}
- private boolean messageIsReceivedByTheSmtpServer() {
- return fakeSmtp.isReceived(response -> response
+ private void assertMessageReceivedByTheSmtpServer() {
+ fakeSmtp.assertEmailReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
.body("[0].subject", equalTo("test")));
http://git-wip-us.apache.org/repos/asf/james-project/blob/843a4c21/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index cb43c36..8aa6230 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -108,7 +108,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
awaitAtMostOneMinute
.pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
- .until(this::messageIsReceivedByTheSmtpServer);
+ .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@Test
@@ -127,7 +127,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage(FROM, RECIPIENT);
- awaitAtMostOneMinute.until(this::messageIsReceivedByTheSmtpServer);
+ awaitAtMostOneMinute.untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@Test
@@ -148,7 +148,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
awaitAtMostOneMinute
.pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
- .until(this::messageIsReceivedByTheSmtpServer);
+ .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@Test
@@ -169,7 +169,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
awaitAtMostOneMinute
.pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
- .until(this::messageIsReceivedByTheSmtpServer);
+ .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@Test
@@ -194,8 +194,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
- assertThat(fakeSmtp.isReceived(response -> response.body("", hasSize(0))))
- .isTrue();
+ fakeSmtp.assertEmailReceived(response -> response.body("", hasSize(0)));
}
@Test
@@ -250,8 +249,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
.awaitMessage(awaitAtMostOneMinute);
}
- private boolean messageIsReceivedByTheSmtpServer() {
- return fakeSmtp.isReceived(response -> response
+ private void assertMessageReceivedByTheSmtpServer() {
+ fakeSmtp.assertEmailReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
.body("[0].subject", equalTo("test")));
http://git-wip-us.apache.org/repos/asf/james-project/blob/843a4c21/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
index dab089b..830e15c 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -111,7 +111,7 @@ public class SmtpAuthorizedAddressesTest {
awaitAtMostOneMinute
.pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
- .until(() -> fakeSmtp.isReceived(response -> response
+ .untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
.body("[0].subject", equalTo("test"))));
@@ -141,7 +141,7 @@ public class SmtpAuthorizedAddressesTest {
awaitAtMostOneMinute
.pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
- .until(() -> fakeSmtp.isReceived(response -> response
+ .untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
.body("[0].subject", equalTo("test"))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/843a4c21/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
index a4de0bb..afac261 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
@@ -161,7 +161,7 @@ public class GroupMappingRelayTest {
awaitAtMostOneMinute
.pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
- .until(() -> fakeSmtp.isReceived(response -> response
+ .untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
.body("[0].from", equalTo(SENDER))
.body("[0].to[0]", equalTo(externalMail))
.body("[0].text", equalTo(MESSAGE_CONTENT))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/843a4c21/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
index 14e78b9..582a8f5 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
@@ -115,8 +115,8 @@ public abstract class VacationRelayIntegrationTest {
smtpClient.sendShortMessageData("content");
calmlyAwait.atMost(1, TimeUnit.MINUTES)
- .until(() ->
- fakeSmtp.isReceived(response -> response
+ .untilAsserted(() ->
+ fakeSmtp.assertEmailReceived(response -> response
.body("[0].from", equalTo(USER_WITH_DOMAIN))
.body("[0].to[0]", equalTo(externalMail))
.body("[0].text", equalTo(REASON))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/843a4c21/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
index 7a3246e..0ae1ccc 100644
--- a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
+++ b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
@@ -81,17 +81,12 @@ public class FakeSmtp implements TestRule {
calmyAwait.until(() -> container.tryConnect(smtpPort));
}
- public boolean isReceived(Function<ValidatableResponse, ValidatableResponse> expectations) {
- try {
- expectations.apply(
- given(requestSpecification(), RESPONSE_SPECIFICATION)
- .get("/api/email")
- .then()
- .statusCode(200));
- return true;
- } catch (Exception e) {
- return false;
- }
+ public void assertEmailReceived(Function<ValidatableResponse, ValidatableResponse> expectations) {
+ expectations.apply(
+ given(requestSpecification(), RESPONSE_SPECIFICATION)
+ .get("/api/email")
+ .then()
+ .statusCode(200));
}
private RequestSpecification requestSpecification() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: pollDelay becomes useless with
untilAsserted
Posted by bt...@apache.org.
pollDelay becomes useless with untilAsserted
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ffa94df9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ffa94df9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ffa94df9
Branch: refs/heads/master
Commit: ffa94df92d1bf0de9c06e282ed857b1d276b882c
Parents: 843a4c2
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Sep 28 16:03:43 2018 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Sep 28 16:03:43 2018 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java | 3 ---
.../mailets/DirectResolutionRemoteDeliveryIntegrationTest.java | 2 --
.../james/mailets/GatewayRemoteDeliveryIntegrationTest.java | 3 ---
.../java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 2 --
.../org/apache/james/transport/mailets/GroupMappingRelayTest.java | 1 -
5 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index 430f3f8..19f934c 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -43,9 +43,6 @@ public abstract class ForwardSmtpTest {
public static final Duration slowPacedPollInterval = ONE_HUNDRED_MILLISECONDS;
public static final ConditionFactory calmlyAwait = Awaitility.with()
.pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
.await();
@ClassRule
http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
index ef36921..9ca5da5 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
@@ -119,7 +119,6 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
.sendMessage(FROM, RECIPIENT);
awaitAtMostOneMinute
- .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
.untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@@ -148,7 +147,6 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
.sendMessage(FROM, RECIPIENT);
awaitAtMostOneMinute
- .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
.untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 8aa6230..49cd2cc 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -107,7 +107,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.sendMessage(FROM, RECIPIENT);
awaitAtMostOneMinute
- .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
.untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@@ -147,7 +146,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.sendMessage(FROM, RECIPIENT);
awaitAtMostOneMinute
- .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
.untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
@@ -168,7 +166,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.sendMessage(FROM, RECIPIENT);
awaitAtMostOneMinute
- .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
.untilAsserted(this::assertMessageReceivedByTheSmtpServer);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
index 830e15c..bb3cf40 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -110,7 +110,6 @@ public class SmtpAuthorizedAddressesTest {
.sendMessage(FROM, TO);
awaitAtMostOneMinute
- .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
.untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
@@ -140,7 +139,6 @@ public class SmtpAuthorizedAddressesTest {
.sendMessage(FROM, TO);
awaitAtMostOneMinute
- .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
.untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
index afac261..4f97b49 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
@@ -160,7 +160,6 @@ public class GroupMappingRelayTest {
.recipient(GROUP_ON_DOMAIN1));
awaitAtMostOneMinute
- .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
.untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
.body("[0].from", equalTo(SENDER))
.body("[0].to[0]", equalTo(externalMail))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: ask DockerRabbitMQ to wait for the
service to be ready after restarts
Posted by bt...@apache.org.
ask DockerRabbitMQ to wait for the service to be ready after restarts
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/43a73fee
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/43a73fee
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/43a73fee
Branch: refs/heads/master
Commit: 43a73fee31f3130c9f38a7460a04f98221839bf4
Parents: ffa94df
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Sep 28 16:22:26 2018 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Sep 28 16:22:26 2018 +0200
----------------------------------------------------------------------
.../rabbitmq/DockerClusterRabbitMQExtension.java | 5 +++++
.../apache/james/backend/rabbitmq/DockerRabbitMQ.java | 14 +++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/43a73fee/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
----------------------------------------------------------------------
diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
index 79ba173..e95fcb6 100644
--- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
+++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
@@ -71,6 +71,11 @@ public class DockerClusterRabbitMQExtension implements BeforeEachCallback, After
Throwing.runnable(rabbitMQ3::startApp));
cluster = new DockerRabbitMQCluster(rabbitMQ1, rabbitMQ2, rabbitMQ3);
+
+ Runnables.runParallel(
+ rabbitMQ1::waitForReadyness,
+ rabbitMQ2::waitForReadyness,
+ rabbitMQ3::waitForReadyness);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/43a73fee/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java
----------------------------------------------------------------------
diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java
index 386d812..36eb2ac 100644
--- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java
+++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java
@@ -67,9 +67,7 @@ public class DockerRabbitMQ {
.withCreateContainerCmdModifier(cmd -> cmd.withName(hostName.orElse(randomName())))
.withCreateContainerCmdModifier(cmd -> cmd.withHostName(hostName.orElse(DEFAULT_RABBIT_NODE)))
.withExposedPorts(DEFAULT_RABBITMQ_PORT, DEFAULT_RABBITMQ_ADMIN_PORT)
- .waitingFor(new WaitAllStrategy()
- .withStrategy(Wait.forHttp("").forPort(DEFAULT_RABBITMQ_ADMIN_PORT).withRateLimiter(RateLimiters.DEFAULT))
- .withStrategy(RabbitMQWaitStrategy.withDefaultTimeout(this)))
+ .waitingFor(waitStrategy())
.withLogConsumer(frame -> LOGGER.debug(frame.getUtf8String()))
.withCreateContainerCmdModifier(cmd -> cmd.getHostConfig()
.withTmpFs(ImmutableMap.of("/var/lib/rabbitmq/mnesia", "rw,noexec,nosuid,size=100m")));
@@ -79,6 +77,12 @@ public class DockerRabbitMQ {
this.nodeName = nodeName;
}
+ private WaitAllStrategy waitStrategy() {
+ return new WaitAllStrategy()
+ .withStrategy(Wait.forHttp("").forPort(DEFAULT_RABBITMQ_ADMIN_PORT).withRateLimiter(RateLimiters.DEFAULT))
+ .withStrategy(RabbitMQWaitStrategy.withDefaultTimeout(this));
+ }
+
private String randomName() {
return UUID.randomUUID().toString();
}
@@ -170,6 +174,10 @@ public class DockerRabbitMQ {
startApp();
}
+ public void waitForReadyness() {
+ waitStrategy().waitUntilReady(container);
+ }
+
public Address address() {
return new Address(getHostIp(), getPort());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/4] james-project git commit: rabbitMQ1 should probably start its
app too
Posted by bt...@apache.org.
rabbitMQ1 should probably start its app too
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/436e8cde
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/436e8cde
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/436e8cde
Branch: refs/heads/master
Commit: 436e8cde4b35b4662f1a9edf38b7eb2382fb5f54
Parents: 43a73fe
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Sep 28 16:23:01 2018 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Sep 28 16:23:01 2018 +0200
----------------------------------------------------------------------
.../james/backend/rabbitmq/DockerClusterRabbitMQExtension.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/436e8cde/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
----------------------------------------------------------------------
diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
index e95fcb6..811c768 100644
--- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
+++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerClusterRabbitMQExtension.java
@@ -64,9 +64,8 @@ public class DockerClusterRabbitMQExtension implements BeforeEachCallback, After
Throwing.runnable(() -> rabbitMQ2.join(rabbitMQ1)),
Throwing.runnable(() -> rabbitMQ3.join(rabbitMQ1)));
-
-
Runnables.runParallel(
+ Throwing.runnable(rabbitMQ1::startApp),
Throwing.runnable(rabbitMQ2::startApp),
Throwing.runnable(rabbitMQ3::startApp));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org