This is an automated email from the ASF dual-hosted git repository. boglesby pushed a commit to branch feature/GEODE-3919 in repository https://gitbox.apache.org/repos/asf/geode.git
commit b9edaa0eaf2d37b41c5b7f39554bb91d298fa1c2 Author: Barry Oglesby <[email protected]> AuthorDate: Mon Oct 30 12:00:14 2017 -0700 GEODE-3919: Changed test to wait for the appropriate queue size since conflation is async --- .../java/org/apache/geode/internal/cache/wan/WANTestBase.java | 9 ++------- .../internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java index 0b06a60..adf4199 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java @@ -112,6 +112,7 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderEventPr import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue; import org.apache.geode.internal.cache.wan.serial.ConcurrentSerialGatewaySenderEventProcessor; import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueue; +import org.apache.geode.internal.logging.LogService; import org.apache.geode.pdx.SimpleClass; import org.apache.geode.pdx.SimpleClass1; import org.apache.geode.test.dunit.Assert; @@ -2547,13 +2548,7 @@ public class WANTestBase extends JUnit4DistributedTestCase { } public static void testQueueSize(String senderId, int numQueueEntries) { - GatewaySender sender = null; - for (GatewaySender s : cache.getGatewaySenders()) { - if (s.getId().equals(senderId)) { - sender = s; - break; - } - } + GatewaySender sender = cache.getGatewaySender(senderId); if (sender.isParallel()) { int totalSize = 0; Set<RegionQueue> queues = ((AbstractGatewaySender) sender).getQueues(); diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java index 2a90308..e2df453 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java @@ -505,8 +505,8 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { int numIterations = 100; vm1.invoke(() -> putSameEntry(regionName, numIterations)); - // Verify queue size (no need to wait) - vm1.invoke(() -> testQueueSize(senderId, 2)); + // Wait for appropriate queue size + vm1.invoke(() -> checkQueueSize(senderId, 2)); // Verify the conflation indexes size stat verifyConflationIndexesSize(senderId, 1, vm1); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
