[geode] branch develop updated: GEODE-2563: fix flaky test (#942)

[jinmeiliao]

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

jinmeiliao 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 7b866cc  GEODE-2563: fix flaky test (#942)
7b866cc is described below

commit 7b866ccfb2bf0970f5a30ca4bf2016d58761d5d2
Author: jinmeiliao <jil...@pivotal.io>
AuthorDate: Wed Oct 18 08:59:16 2017 -0700

    GEODE-2563: fix flaky test (#942)
---
 .../internal/cli/commands/DestroyRegionCommandDUnitTest.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
index 5a193d5..89bb3bd 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
@@ -125,7 +125,7 @@ public class DestroyRegionCommandDUnitTest {
       Cache cache = LocatorServerStartupRule.serverStarter.getCache();
       RegionFactory<Object, Object> factory = 
cache.createRegionFactory(RegionShortcut.PARTITION);
       factory.create("Customer");
-      factory.create("Customer-2");
+      factory.create("Customer_2");
       factory.create("Customer_3");
     }, server1, server2);
 
@@ -134,20 +134,22 @@ public class DestroyRegionCommandDUnitTest {
       RegionFactory<Object, Object> factory = 
cache.createRegionFactory(RegionShortcut.REPLICATE);
       factory.setScope(Scope.LOCAL);
       factory.create("Customer");
-      factory.create("Customer-2");
+      factory.create("Customer_2");
       factory.create("Customer_3");
     });
 
     locator.invoke(() -> waitForRegionMBeanCreation("/Customer", 3));
+    locator.invoke(() -> waitForRegionMBeanCreation("/Customer_2", 3));
+    locator.invoke(() -> waitForRegionMBeanCreation("/Customer_3", 3));
 
     gfsh.executeAndVerifyCommand("destroy region --name=Customer", "destroyed 
successfully");
-    gfsh.executeAndVerifyCommand("destroy region --name=Customer-2", 
"destroyed successfully");
+    gfsh.executeAndVerifyCommand("destroy region --name=Customer_2", 
"destroyed successfully");
     gfsh.executeAndVerifyCommand("destroy region --name=Customer_3", 
"destroyed successfully");
 
     MemberVM.invokeInEveryMember(() -> {
       Cache cache = LocatorServerStartupRule.serverStarter.getCache();
       assertThat(cache.getRegion("Customer")).isNull();
-      assertThat(cache.getRegion("Customer-2")).isNull();
+      assertThat(cache.getRegion("Customer_2")).isNull();
       assertThat(cache.getRegion("Customer_3")).isNull();
     }, server1, server2, server3);
   }
@@ -199,7 +201,7 @@ public class DestroyRegionCommandDUnitTest {
         String queryExp =
             
MessageFormat.format(ManagementConstants.OBJECTNAME__REGION_MXBEAN, regionPath, 
"*");
         ObjectName queryExpON = new ObjectName(queryExp);
-        return mbeanServer.queryNames(null, queryExpON).size() == mbeanCount;
+        return mbeanServer.queryNames(queryExpON, null).size() == mbeanCount;
       } catch (MalformedObjectNameException mone) {
         throw new RuntimeException(mone);
       }

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].