Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3B9DD200CF3 for ; Wed, 19 Jul 2017 20:04:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 39E0816989D; Wed, 19 Jul 2017 18:04:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8A11D169891 for ; Wed, 19 Jul 2017 20:04:29 +0200 (CEST) Received: (qmail 93303 invoked by uid 500); 19 Jul 2017 18:04:23 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 91094 invoked by uid 99); 19 Jul 2017 18:04:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jul 2017 18:04:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EBBFAF5EC3; Wed, 19 Jul 2017 18:04:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ladyvader@apache.org To: commits@geode.apache.org Date: Wed, 19 Jul 2017 18:05:09 -0000 Message-Id: <2be5d69401a64c30bbea67d8d30e9076@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [51/51] [abbrv] geode git commit: GEODE-3113: Modify HARegionQueue test to use Awaitility vs. timeouts archived-at: Wed, 19 Jul 2017 18:04:30 -0000 GEODE-3113: Modify HARegionQueue test to use Awaitility vs. timeouts * Modify test to use Awaitility (at most 60 seconds) vs. sleeps prior to checking expiration Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f286244a Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f286244a Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f286244a Branch: refs/heads/feature/GEODE-3113 Commit: f286244a864e3eb61bbb586b678d39e0227bd574 Parents: b673ff9 Author: Lynn Hughes-Godfrey Authored: Tue Jul 18 13:48:24 2017 -0700 Committer: Lynn Hughes-Godfrey Committed: Wed Jul 19 11:04:02 2017 -0700 ---------------------------------------------------------------------- .../geode/internal/cache/ha/HARQAddOperationJUnitTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/f286244a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java index 8459cf6..e624cae 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java @@ -21,11 +21,13 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.ha.HARegionQueue.MapWrapper; import org.apache.geode.test.junit.categories.ClientSubscriptionTest; import org.apache.logging.log4j.Logger; +import org.awaitility.Awaitility; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -287,12 +289,11 @@ public class HARQAddOperationJUnitTest { eventsMap.get(threadId)); // wait for some more time to allow expiry on data - Thread.sleep(16000); - // After the expiry of the data , AvaialbleIds size should be 0, // entry // removed from Region, LastDispatchedWrapperSet should have size 0. - assertEquals(0, regionqueue.getRegion().entrySet(false).size()); + Awaitility.await().atMost(60, TimeUnit.SECONDS) + .until(() -> assertEquals(0, regionqueue.getRegion().entrySet(false).size())); assertEquals(0, regionqueue.getAvalaibleIds().size()); assertNull(regionqueue.getCurrentCounterSet(id1));