Repository: james-project Updated Branches: refs/heads/master 4850f83a8 -> 343962800
JAMES-2595 Swift blob saving can exceed default awaitability timeouts A timeout of one minute seems safer Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/34396280 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/34396280 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/34396280 Branch: refs/heads/master Commit: 34396280084591f0e46c043afb13fd961d2f9306 Parents: 4850f83 Author: Benoit Tellier <btell...@linagora.com> Authored: Thu Dec 13 18:50:05 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Fri Dec 14 11:58:59 2018 +0700 ---------------------------------------------------------------------- .../apache/james/jmap/methods/integration/FilterTest.java | 9 +++++---- .../james/jmap/methods/integration/SendMDNMethodTest.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/34396280/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/FilterTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/FilterTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/FilterTest.java index db25b20..adadc67 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/FilterTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/FilterTest.java @@ -36,6 +36,7 @@ import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.apache.james.mailbox.model.MailboxConstants.INBOX; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Duration.ONE_MINUTE; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; @@ -744,8 +745,8 @@ public abstract class FilterTest { .body(requestBody) .post("/jmap"); - calmlyAwait.until( - () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox)); + calmlyAwait.atMost(ONE_MINUTE) + .until(() -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, matchedMailbox)); } @Test @@ -1078,8 +1079,8 @@ public abstract class FilterTest { .then() .statusCode(200); - calmlyAwait.until( - () -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox)); + calmlyAwait.atMost(ONE_MINUTE) + .until(() -> JmapCommonRequests.isAnyMessageFoundInRecipientsMailbox(accessToken, inbox)); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/34396280/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java index 5cd4620..8cd79a3 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java @@ -32,6 +32,7 @@ import static org.apache.james.jmap.TestingConstants.DOMAIN; import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; +import static org.awaitility.Duration.ONE_MINUTE; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -307,7 +308,7 @@ public abstract class SendMDNMethodTest { .post("/jmap"); // BART should have received it - calmlyAwait.until(() -> !listMessageIdsInMailbox(bartAccessToken, getInboxId(bartAccessToken)).isEmpty()); + calmlyAwait.atMost(ONE_MINUTE).until(() -> !listMessageIdsInMailbox(bartAccessToken, getInboxId(bartAccessToken)).isEmpty()); String bartInboxMessageIds = Iterables.getOnlyElement(listMessageIdsInMailbox(bartAccessToken, getInboxId(bartAccessToken))); String firstMessage = ARGUMENTS + ".list[0]"; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
