GEODE-4913: gfsh start server cmd is not recognizing local properties...

... and cache.xml, instead using default Fixed DUnit test failures by reverting the test assertions as like earlier.
bschuchardt · Mar 28, 2018 · 1be57f3 · 1be57f3
1 parent 6e11fe2
commit 1be57f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.../apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java b/.../apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
@@ -112,8 +112,7 @@ public void create_queue_updates_cc() throws Exception {
     locator.invoke(() -> {
       ClusterConfigurationService service =
           ClusterStartupRule.getLocator().getSharedConfiguration();
-      assertThat(service.getConfiguration("cluster").getCacheXmlContent())
-          .doesNotContain("async-event-queue");
+      assertThat(service.getConfiguration("cluster").getCacheXmlContent()).isNull();
     });
 
     gfsh.executeAndAssertThat(VALID_COMMAND + " --id=queue").statusIsSuccess()

diff --git a/...g/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java b/...g/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
@@ -205,10 +205,7 @@ public void multipleIndexesOnMultipleRegionsInMemberGroup() {
           ((InternalLocator) Locator.getLocator()).getSharedConfiguration();
       assertThat(sharedConfig.getConfiguration("group1").getCacheXmlContent()).contains(index2Name,
           index1Name);
-      assertThat(sharedConfig.getConfiguration("cluster").getCacheXmlContent())
-          .doesNotContain(index2Name);
-      assertThat(sharedConfig.getConfiguration("cluster").getCacheXmlContent())
-          .doesNotContain(index1Name);
+      assertThat(sharedConfig.getConfiguration("cluster").getCacheXmlContent()).isNullOrEmpty();
     });
   }
 }