[geode] branch develop updated: GEODE-5097: Wait for dispatcher to pause in AsyncEventQueue test (#2175)

[wirebaron]

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

wirebaron 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 5f8f3fc  GEODE-5097: Wait for dispatcher to pause in AsyncEventQueue 
test (#2175)
5f8f3fc is described below

commit 5f8f3fcdb7742617c31c1ae8fc7c199495eb3481
Author: Brian Rowe <br...@pivotal.io>
AuthorDate: Tue Jul 24 10:06:07 2018 -0700

    GEODE-5097: Wait for dispatcher to pause in AsyncEventQueue test (#2175)
    
    * GEODE-5097: Wait for dispatcher to pause in AsyncEventQueue test
---
 .../asyncqueue/AsyncEventQueueStatsDUnitTest.java  | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
index 96a7e1c..5df0324 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
@@ -26,7 +26,6 @@ import 
org.apache.geode.internal.cache.wan.AsyncEventQueueTestBase;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.junit.categories.AEQTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.categories.WanTest;
 
 @Category({AEQTest.class})
@@ -85,7 +84,7 @@ public class AsyncEventQueueStatsDUnitTest extends 
AsyncEventQueueTestBase {
   /**
    * Two listeners added to the same RR.
    */
-  @Category({FlakyTest.class, WanTest.class}) // GEODE-5097
+  @Category(WanTest.class)
   @Test
   public void testAsyncStatsTwoListeners() throws Exception {
     Integer lnPort = createFirstLocatorWithDSId(1);
@@ -122,14 +121,22 @@ public class AsyncEventQueueStatsDUnitTest extends 
AsyncEventQueueTestBase {
     vm4.invoke(() -> 
AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue(
         getTestMethodName() + "_RR", "ln1,ln2", isOffHeap()));
 
-    vm1.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
-    vm2.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
-    vm3.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
-    vm4.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
-    vm1.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
-    vm2.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
-    vm3.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
-    vm4.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
+    vm1.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln1"));
+    vm2.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln1"));
+    vm3.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln1"));
+    vm4.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln1"));
+    vm1.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln2"));
+    vm2.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln2"));
+    vm3.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln2"));
+    vm4.invoke(
+        () -> 
AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause("ln2"));
 
     vm1.invoke(() -> AsyncEventQueueTestBase.doPuts(getTestMethodName() + 
"_RR", 1000));