You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by es...@apache.org on 2017/05/22 23:02:44 UTC

geode git commit: GEODE-2916: Fix a flaky timing issue.

Repository: geode
Updated Branches:
  refs/heads/develop ae1c56f70 -> 8782f0b73


GEODE-2916: Fix a flaky timing issue.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/8782f0b7
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/8782f0b7
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/8782f0b7

Branch: refs/heads/develop
Commit: 8782f0b73822b333e756fe5a61d7a677b5eadaca
Parents: ae1c56f
Author: eshu <es...@pivotal.io>
Authored: Mon May 22 16:00:50 2017 -0700
Committer: eshu <es...@pivotal.io>
Committed: Mon May 22 16:00:50 2017 -0700

----------------------------------------------------------------------
 .../org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/8782f0b7/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
index 2dcf8e9..7a84dbc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
@@ -22,12 +22,14 @@ import static org.junit.Assert.*;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
+import org.awaitility.Awaitility;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.AttributesMutator;
@@ -222,7 +224,9 @@ public class CacheAdvisorDUnitTest extends JUnit4CacheTestCase {
       });
     }
 
-    assertEquals(expected, rgn.getCacheDistributionAdvisor().adviseNetLoad());
+    Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS)
+        .atMost(30, TimeUnit.SECONDS)
+        .until(() -> assertEquals(expected, rgn.getCacheDistributionAdvisor().adviseNetLoad()));
   }
 
   /**