[geode] branch develop updated: GEODE-5132: Fix testParallelPropagationLoopBack3Sites

[nnag]

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

nnag 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 497b866  GEODE-5132: Fix testParallelPropagationLoopBack3Sites
497b866 is described below

commit 497b866c8e1e5fb68b7f2cc236ae1044d65a0798
Author: Jason Huynh <huyn...@gmail.com>
AuthorDate: Wed May 2 08:36:01 2018 -0700

    GEODE-5132: Fix testParallelPropagationLoopBack3Sites
    
      * Reduced chance of failure by waiting for sender to resume before 
verifying
      * Increased await time
---
 .../test/java/org/apache/geode/internal/cache/wan/WANTestBase.java  | 2 +-
 .../cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java | 6 +++---
 2 files changed, 4 insertions(+), 4 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 63dfc61..cc51acf 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
@@ -2704,7 +2704,7 @@ public class WANTestBase extends DistributedTestCase {
   }
 
   public static void validateRegionSize(String regionName, final int 
regionSize) {
-    validateRegionSize(regionName, regionSize, 30000);
+    validateRegionSize(regionName, regionSize, 60000);
   }
 
   public static void validateRegionSize(String regionName, final int 
regionSize,
diff --git 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
index 3e03afa..cee033c 100644
--- 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
+++ 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
@@ -187,9 +187,6 @@ public class ParallelWANPropagationLoopBackDUnitTest 
extends WANTestBase {
 
     vm5.invoke(() -> WANTestBase.pauseSender("tk"));
 
-    // need to have this pause since pauseSender doesn't take effect 
immediately
-    Wait.pause(1000);
-
     // do puts on site1
     vm3.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_PR", 100));
 
@@ -203,6 +200,8 @@ public class ParallelWANPropagationLoopBackDUnitTest 
extends WANTestBase {
     // resume sender on site1 so that events reach site2 and from there to 
site3
     vm3.invoke(() -> WANTestBase.resumeSender("ln"));
     vm6.invoke(() -> WANTestBase.resumeSender("ln"));
+    vm6.invoke(() -> waitForSenderRunningState("ln"));
+    vm3.invoke(() -> waitForSenderRunningState("ln"));
 
     // validate region size on site2 (should have 100) and site3 (should have 
200)
     vm4.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + 
"_PR", 100));
@@ -214,6 +213,7 @@ public class ParallelWANPropagationLoopBackDUnitTest 
extends WANTestBase {
 
     // resume sender on site3
     vm5.invoke(() -> WANTestBase.resumeSender("tk"));
+    vm5.invoke(() -> waitForSenderRunningState("tk"));
 
     // validate region size
     vm3.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + 
"_PR", 200));

-- 
To stop receiving notification emails like this one, please contact
n...@apache.org.