[geode] branch develop updated: GEODE-5373: Adjust timing for GMSHealthMonitorJUnitTest.testRemoveMemberCalled (#2097)

[jensdeppe]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 3937ebe  GEODE-5373: Adjust timing for 
GMSHealthMonitorJUnitTest.testRemoveMemberCalled (#2097)
3937ebe is described below

commit 3937ebe81ee23397c61e3444e17fb2f18dedd289
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Thu Jul 5 08:29:51 2018 -0700

    GEODE-5373: Adjust timing for 
GMSHealthMonitorJUnitTest.testRemoveMemberCalled (#2097)
    
    - This test fails on Windows when run in conjunction with other tests - on 
its
      own it always passes. There appears to be a thread scheduling difference 
in
      Windows that is resulting in the Failure Detection Scheduler thread 
running
      after the sleep interval.
---
 .../internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 3ed2537..4bcc2b9 100644
--- 
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -365,7 +365,7 @@ public class GMSHealthMonitorJUnitTest {
 
     gmsHealthMonitor.installView(v);
 
-    Thread.sleep(memberTimeout / GMSHealthMonitor.LOGICAL_INTERVAL);
+    Thread.sleep(memberTimeout);
 
     ArrayList<InternalDistributedMember> recipient = new 
ArrayList<InternalDistributedMember>();
     recipient.add(mockMembers.get(0));
@@ -379,7 +379,7 @@ public class GMSHealthMonitorJUnitTest {
     gmsHealthMonitor.processMessage(sm);
 
     Awaitility.await("waiting for remove(member) to be invoked")
-        .atMost(3 * memberTimeout, TimeUnit.SECONDS).until(() -> {
+        .atMost(3 * memberTimeout, TimeUnit.MILLISECONDS).until(() -> {
           verify(joinLeave, 
atLeastOnce()).remove(any(InternalDistributedMember.class),
               any(String.class));
         });