Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geode.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: klund@apache.org
To: commits@geode.incubator.apache.org
Date: Fri, 20 May 2016 16:29:57 -0000
Message-Id: <9aba605c45624763839657c29044126c@git.apache.org>
In-Reply-To: <ea4e67faea924b60883c64e6a5510b9a@git.apache.org>
References: <ea4e67faea924b60883c64e6a5510b9a@git.apache.org>
Subject: [26/49] incubator-geode git commit: GEODE-1390: Disabling broken test
archived-at: Fri, 20 May 2016 16:29:38 -0000

GEODE-1390: Disabling broken test


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/08ef0c1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/08ef0c1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/08ef0c1e

Branch: refs/heads/feature/GEODE-835-test
Commit: 08ef0c1ee442d33e2da872a4a5e4bdb120d25817
Parents: 884cf13
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Sat May 14 15:14:12 2016 -0700
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Sat May 14 15:14:12 2016 -0700

----------------------------------------------------------------------
 .../cli/commands/HelpCommandsJUnitTest.java       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/08ef0c1e/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsJUnitTest.java
index 7cbe85a..1d81d2e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsJUnitTest.java
@@ -25,7 +25,9 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 import com.gemstone.gemfire.management.internal.cli.shell.GfshConfig;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -41,8 +43,10 @@ public class HelpCommandsJUnitTest extends JUnit4DistributedTestCase {
 
   private int jmxPort;
 
+  private Gfsh gfsh;
+
   @Before
-  public void setup() {
+  public void setup() throws Exception {
     jmxPort = AvailablePortHelper.getRandomAvailableTCPPort();
 
     Properties localProps = new Properties();
@@ -51,15 +55,22 @@ public class HelpCommandsJUnitTest extends JUnit4DistributedTestCase {
     localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort));
     getSystem(localProps);
 
+    gfsh = Gfsh.getInstance(false, new String[0], new GfshConfig());
   }
 
+  @After
+  public void teardown() {
+    disconnectAllFromDS();
+
+    gfsh.executeCommand("disconnect");
+  }
+
+  @Ignore("Disconnect command doesn't appear to be working")
   @Test
   public void testOfflineHelp() throws Exception {
     Properties helpProps = new Properties();
     helpProps.load(HelpCommandsJUnitTest.class.getResourceAsStream("golden-help-offline.properties"));
 
-    Gfsh gfsh = Gfsh.getInstance(false, new String[0], new GfshConfig());
-
     CommandManager cm = CommandManager.getInstance();
     for (Map.Entry<String, CommandTarget> e : cm.getCommands().entrySet()) {
       // Mock commands may have been produced in the VM by other tests
@@ -88,7 +99,6 @@ public class HelpCommandsJUnitTest extends JUnit4DistributedTestCase {
     Properties helpProps = new Properties();
     helpProps.load(HelpCommandsJUnitTest.class.getResourceAsStream("golden-help-online.properties"));
 
-    Gfsh gfsh = Gfsh.getInstance(false, new String[0], new GfshConfig());
     gfsh.executeCommand("connect --jmx-manager=localhost[" + jmxPort + "]");
 
     CommandManager cm = CommandManager.getInstance();