[geode] branch develop updated: GEODE-4878: Remove Thread.sleep from ClusterConfigLocatorRestartDUnitTest (#1633)

[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 ce0c965  GEODE-4878: Remove Thread.sleep from 
ClusterConfigLocatorRestartDUnitTest (#1633)
ce0c965 is described below

commit ce0c965141fcb2705f4c95b51d29d22da07090cd
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Mon Mar 19 11:22:58 2018 -0700

    GEODE-4878: Remove Thread.sleep from ClusterConfigLocatorRestartDUnitTest 
(#1633)
---
 .../ClusterConfigLocatorRestartDUnitTest.java             | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
index dae0547..933da25 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
@@ -16,13 +16,16 @@
 package org.apache.geode.management.internal.configuration;
 
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
+import org.awaitility.Awaitility;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.InternalLocator;
 import 
org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper;
 import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.IgnoredException;
@@ -54,8 +57,7 @@ public class ClusterConfigLocatorRestartDUnitTest {
     locator0.invokeAsync(() -> MembershipManagerHelper
         
.crashDistributedSystem(InternalDistributedSystem.getConnectedInstance()));
 
-    // Wait some time to reconnect
-    Thread.sleep(10000);
+    waitForLocatorToReconnect(locator0);
 
     rule.startServerVM(3, locator0.getPort());
 
@@ -90,8 +92,7 @@ public class ClusterConfigLocatorRestartDUnitTest {
     server3.invokeAsync(() -> MembershipManagerHelper
         
.crashDistributedSystem(InternalDistributedSystem.getConnectedInstance()));
 
-    // Wait some time to reconnect
-    Thread.sleep(10000);
+    waitForLocatorToReconnect(locator1);
 
     rule.startServerVM(4, locator1.getPort(), locator0.getPort());
 
@@ -103,4 +104,10 @@ public class ClusterConfigLocatorRestartDUnitTest {
     Host.getHost(0).getVM(0).bounce();
   }
 
+  private void waitForLocatorToReconnect(MemberVM locator) {
+    Awaitility.waitAtMost(30, TimeUnit.SECONDS).until(() -> locator.invoke(() 
-> {
+      InternalLocator intLocator = InternalLocator.getLocator();
+      return intLocator != null && intLocator.isSharedConfigurationRunning();
+    }));
+  }
 }

-- 
To stop receiving notification emails like this one, please contact
jensde...@apache.org.