Repository: incubator-geode Updated Branches: refs/heads/develop bb1b538ea -> fc7811f36
GEODE-438: wait longer in test validation code Four places still existed that only waited for 3 seconds. One of those was the last failure of this test. Now the test waits 30 seconds. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fc7811f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fc7811f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fc7811f3 Branch: refs/heads/develop Commit: fc7811f369d6ffac004cf110a9d87037014b0ac6 Parents: bb1b538 Author: Darrel Schneider <[email protected]> Authored: Tue Nov 3 16:45:45 2015 -0800 Committer: Darrel Schneider <[email protected]> Committed: Tue Nov 3 16:50:38 2015 -0800 ---------------------------------------------------------------------- .../management/MemoryThresholdsOffHeapDUnitTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fc7811f3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java index 8faa03c..a6f24d0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java @@ -660,13 +660,13 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase { r.put("oh3", new byte[157287]); WaitCriterion wc = new WaitCriterion() { public String description() { - return "verify critical state"; + return "expected region " + r + " to set memoryThreshold"; } public boolean done() { return r.memoryThresholdReached.get(); } }; - waitForCriterion(wc, 3000, 100, true); + waitForCriterion(wc, 30*1000, 10, true); { Integer k = new Integer(5); assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++))); @@ -675,13 +675,13 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase { r.destroy("oh3"); wc = new WaitCriterion() { public String description() { - return "verify critical state"; + return "expected region " + r + " to unset memoryThreshold"; } public boolean done() { return !r.memoryThresholdReached.get(); } }; - waitForCriterion(wc, 3000, 100, true); + waitForCriterion(wc, 30*1000, 10, true); { Integer k = new Integer(6); assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++))); @@ -1009,7 +1009,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase { return false; } }; - waitForCriterion(wc, 3000, 100, true); + waitForCriterion(wc, 30*1000, 10, true); final Integer k = new Integer(2); // reload with same key again and again final Integer expectedInvocations3 = new Integer(expectedInvocations.getAndIncrement()); @@ -1054,7 +1054,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase { return !r.memoryThresholdReached.get(); } }; - waitForCriterion(wc, 3000, 100, true); + waitForCriterion(wc, 30*1000, 10, true); Integer k = new Integer(3); // same key as previously used, this time is should stick Integer expectedInvocations8 = new Integer(expectedInvocations.incrementAndGet());
