[geode] branch develop updated: GEODE-5383: Check that data propagated earlier

[upthewaterspout]

This is an automated email from the ASF dual-hosted git repository.

upthewaterspout 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 b79b64a  GEODE-5383: Check that data propagated earlier
b79b64a is described below

commit b79b64a7cbdc4de1ffc1fe34222b56ac867ab38c
Author: Helena A. Bales <hba...@pivotal.io>
AuthorDate: Fri Jul 6 15:01:08 2018 -0700

    GEODE-5383: Check that data propagated earlier
    
    Check that the data is propagated through WAN before checking the
    status of the event queues. This test was flaky because the event queues
    were being checked before the events had been added to the event queue,
    so the queue was changing as it was being checked. By checking that the
    data has been propaged to the other cluster first, we can know that all
    events have been added.
    
    Co-authored-by: Finn Southerland <fsoutherl...@pivotal.io>
---
 .../test/java/org/apache/geode/internal/cache/wan/WANTestBase.java    | 2 +-
 .../apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 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 2cdb1c8..3f995c6 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
@@ -3296,7 +3296,7 @@ public class WANTestBase extends DistributedTestCase {
             + abstractSender.getSecondaryEventQueueSize() + ". Queue content 
is: "
             + displayQueueContent(queue), 0, 
abstractSender.getSecondaryEventQueueSize());
       });
-      assertEquals("Except events in all secondary queues after drain is 0", 0,
+      assertEquals("Expected events in all secondary queues after drain is 0", 
0,
           abstractSender.getSecondaryEventQueueSize());
     } finally {
       exp.remove();
diff --git 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 588dab7..be3fd1d 100644
--- 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -156,12 +156,14 @@ public class DistTXWANDUnitTest extends WANTestBase {
 
     vm4.invoke(() -> WANTestBase.doDistTXPuts(getTestMethodName() + "_PR", 5));
 
+    // verify that the data was received
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + 
"_PR", 5));
+
     // verify all buckets drained on all sender nodes.
     vm4.invoke(() -> 
WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
     vm5.invoke(() -> 
WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
     vm6.invoke(() -> 
WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
     vm7.invoke(() -> 
WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
 
-    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + 
"_PR", 5));
   }
 }