Repository: james-project Updated Branches: refs/heads/master e48e3a607 -> 0bfab26e5
JAMES-1717 Increase integration test timeouts to 30 seconds Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0bfab26e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0bfab26e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0bfab26e Branch: refs/heads/master Commit: 0bfab26e53019b563f22104b521c5e3e1d3afcdf Parents: 5e858b6 Author: Benoit Tellier <[email protected]> Authored: Tue May 31 17:51:46 2016 +0700 Committer: Matthieu Baechler <[email protected]> Committed: Tue May 31 18:10:56 2016 +0200 ---------------------------------------------------------------------- .../apache/james/jmap/VacationIntegrationTest.java | 12 ++++++------ .../methods/integration/SetMessagesMethodTest.java | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0bfab26e/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 9e96044..616c8c9 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -114,10 +114,10 @@ public abstract class VacationIntegrationTest { // Then // User 1 should well receive this mail - calmlyAwait.atMost(10, TimeUnit.SECONDS) + calmlyAwait.atMost(30, TimeUnit.SECONDS) .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2, USER_1)); // User 2 should well receive a notification about user 1 vacation - calmlyAwait.atMost(10, TimeUnit.SECONDS) + calmlyAwait.atMost(30, TimeUnit.SECONDS) .until( () -> isTextMessageReceived(user2AccessToken, getInboxId(user2AccessToken), REASON, USER_1, USER_2)); } @@ -140,7 +140,7 @@ public abstract class VacationIntegrationTest { // Then // User 1 should well receive this mail - calmlyAwait.atMost(10, TimeUnit.SECONDS) + calmlyAwait.atMost(30, TimeUnit.SECONDS) .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2, USER_1)); // User 2 should not receive a notification Thread.sleep(1000L); @@ -186,7 +186,7 @@ public abstract class VacationIntegrationTest { // Then // User 2 should well receive a notification about user 1 vacation - calmlyAwait.atMost(10, TimeUnit.SECONDS) + calmlyAwait.atMost(30, TimeUnit.SECONDS) .until(() -> isTextMessageReceived(user2AccessToken, getInboxId(user2AccessToken), REASON, USER_1, USER_2)); // User 2 should not receive another notification Thread.sleep(1000L); @@ -212,7 +212,7 @@ public abstract class VacationIntegrationTest { String user2OutboxId = getOutboxId(user2AccessToken); sendMail(user2AccessToken, user2OutboxId, "user|inbox|1"); // Wait user 1 to receive the eMail before reset of vacation - calmlyAwait.atMost(10, TimeUnit.SECONDS) + calmlyAwait.atMost(30, TimeUnit.SECONDS) .until(() -> isTextMessageReceived(user1AccessToken, getInboxId(user1AccessToken), ORIGINAL_MESSAGE_TEXT_BODY, USER_2, USER_1)); // When @@ -223,7 +223,7 @@ public abstract class VacationIntegrationTest { // Then // User 2 should well receive two notification about user 1 vacation - calmlyAwait.atMost(10, TimeUnit.SECONDS) + calmlyAwait.atMost(30, TimeUnit.SECONDS) .until(() -> areTwoTextMessageReceived(user2AccessToken, getInboxId(user2AccessToken))); } http://git-wip-us.apache.org/repos/asf/james-project/blob/0bfab26e/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 4f162ef..5680057 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -797,7 +797,7 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then - calmlyAwait.atMost(10, TimeUnit.SECONDS).until( () -> messageHasBeenMovedToSentBox(sentMailboxId)); + calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> messageHasBeenMovedToSentBox(sentMailboxId)); } private boolean messageHasBeenMovedToSentBox(String sentMailboxId) { @@ -1011,7 +1011,7 @@ public abstract class SetMessagesMethodTest { .when() .post("/jmap"); // Then - calmlyAwait.atMost(10, TimeUnit.SECONDS).until( () -> messageHasBeenMovedToSentBox(sentMailboxId)); + calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> messageHasBeenMovedToSentBox(sentMailboxId)); } @@ -1135,7 +1135,7 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then - calmlyAwait.atMost(10, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(recipientToken)); + calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(recipientToken)); } @Test @@ -1181,7 +1181,7 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then - calmlyAwait.atMost(10, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(recipientToken)); + calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(recipientToken)); with() .accept(ContentType.JSON) .contentType(ContentType.JSON) @@ -1244,7 +1244,7 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then - calmlyAwait.atMost(10, TimeUnit.SECONDS).until( () -> messageHasBeenMovedToSentBox(sentMailboxId)); + calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> messageHasBeenMovedToSentBox(sentMailboxId)); with() .accept(ContentType.JSON) .contentType(ContentType.JSON) @@ -1308,7 +1308,7 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then - calmlyAwait.atMost(10, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(bccToken)); + calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> isAnyMessageFoundInRecipientsMailboxes(bccToken)); with() .accept(ContentType.JSON) .contentType(ContentType.JSON) @@ -1386,7 +1386,7 @@ public abstract class SetMessagesMethodTest { .post("/jmap"); // Then - calmlyAwait.atMost(10, TimeUnit.SECONDS).until( () -> isHtmlMessageReceived(recipientToken)); + calmlyAwait.atMost(30, TimeUnit.SECONDS).until( () -> isHtmlMessageReceived(recipientToken)); } private boolean isHtmlMessageReceived(AccessToken recipientToken) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
