You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/04/07 19:34:09 UTC

[10/19] geode git commit: GEM-1351: Move a test to the open side and fix the other tests

GEM-1351: Move a test to the open side and fix the other tests

* move ImportClusterConfigDistributedTest to open side
* remove @Ignore from other two tests.
* rework GfshShellConnectionRule to not create gfsh shell at class initialization time.


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

Branch: refs/heads/feature/GEODE-2632
Commit: 02ccc5ca06ee5fe07cdb3924a5b1bbce507d2b58
Parents: 82034c9
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Apr 5 07:50:09 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Apr 5 07:50:09 2017 -0700

----------------------------------------------------------------------
 .../apache/geode/test/dunit/rules/GfshShellConnectionRule.java   | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/02ccc5ca/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
index bfb77e7..1c72bba 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
@@ -121,6 +121,10 @@ public class GfshShellConnectionRule extends DescribedExternalResource {
 
   public void connect(int port, PortType type, String... options) throws Exception {
     CliUtil.isGfshVM = true;
+    if(gfsh == null){
+      this.gfsh = new HeadlessGfsh(getClass().getName(), 30,
+          temporaryFolder.newFolder("gfsh_files").getAbsolutePath());
+    }
     final CommandStringBuilder connectCommand = new CommandStringBuilder(CliStrings.CONNECT);
     String endpoint;
     if (type == PortType.locator) {