You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2016/06/02 21:19:50 UTC
incubator-geode git commit: moved wan tests assertions inside
awaitility
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-93 b55478387 -> dce9316fe
moved wan tests assertions inside awaitility
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dce9316f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dce9316f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dce9316f
Branch: refs/heads/feature/GEODE-93
Commit: dce9316fe9e54bdae3a8ecb89179807e4a2e84b0
Parents: b554783
Author: Sai Boorlagadda <sb...@pivotal.io>
Authored: Thu Jun 2 11:49:58 2016 -0700
Committer: Sai Boorlagadda <sb...@pivotal.io>
Committed: Thu Jun 2 11:49:58 2016 -0700
----------------------------------------------------------------------
...llelGatewaySenderQueueOverflowDUnitTest.java | 42 +++++++++++---------
1 file changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dce9316f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index 7169b2e..8502021 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -19,6 +19,7 @@ package com.gemstone.gemfire.internal.cache.wan.parallel;
import java.io.File;
import java.util.Properties;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheFactory;
@@ -42,6 +43,7 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
+import com.jayway.awaitility.Awaitility;
/**
* DUnit for ParallelSenderQueue overflow operations.
@@ -97,26 +99,30 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
int numEventPuts = 50;
vm4.invoke(() -> WANTestBase.doHeavyPuts( getTestMethodName(), numEventPuts ));
- long numOvVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
- long numOvVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
- long numOvVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
- long numOvVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
-
- long numMemVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
- long numMemVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
- long numMemVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
- long numMemVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
- LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
- LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
-
- long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7;
//considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk.
- assertTrue("Total number of entries overflown to disk should be at least greater than 55", (totalOverflown > 55));
-
- long totalInMemory = numMemVm4 + numMemVm5 + numMemVm6 + numMemVm7;
- //expected is twice the number of events put due to redundancy level of 1
- assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
+ Awaitility.await().atMost(60, TimeUnit.SECONDS).until(()->
+ {
+ long numOvVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+ long numOvVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+ long numOvVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+ long numOvVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+
+ long numMemVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+ long numMemVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+ long numMemVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+ long numMemVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+
+ LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+ LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+ long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7;
+ assertTrue("Total number of entries overflown to disk should be at least greater than 55", (totalOverflown > 55));
+
+ long totalInMemory = numMemVm4 + numMemVm5 + numMemVm6 + numMemVm7;
+ //expected is twice the number of events put due to redundancy level of 1
+ assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
+
+ });
vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));