geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasonhu...@apache.org
Subject [07/13] incubator-geode git commit: GEODE-115 Change gfsh path for integration tests
Date Mon, 27 Jul 2015 21:43:04 GMT
GEODE-115 Change gfsh path for integration tests

Spark Geode Connector now uses gfsh from current Geode build.


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

Branch: refs/heads/develop
Commit: 047ef62fa58045880e87b73bb4013dd40ead0e4e
Parents: 2793365
Author: Jianxia Chen <jchen@pivotal.io>
Authored: Tue Jul 14 15:48:43 2015 -0700
Committer: Jianxia Chen <jchen@pivotal.io>
Committed: Tue Jul 14 15:48:43 2015 -0700

----------------------------------------------------------------------
 .../gemfire/spark/connector/testkit/GemFireRunner.scala   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/047ef62f/gemfire-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
----------------------------------------------------------------------
diff --git a/gemfire-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
b/gemfire-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
index 1984d6c..27738d3 100644
--- a/gemfire-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
+++ b/gemfire-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
@@ -12,13 +12,7 @@ import org.apache.commons.io.filefilter.IOFileFilter
 * start and stop the locator and servers.
 */
 class GemFireRunner(settings: Properties) {
-
-  private def gemfireHome: String = scala.util.Properties.envOrNone("GEMFIRE") match {
-    case Some(home) => home
-    case None => throw new RuntimeException("No GEMFIRE environment variable set in environment.")
-  }
-
-  val gfshCmd = new File(gemfireHome, "bin/gfsh").toString
+  val gfshCmd = new File(getCurrentDirectory, "../../gemfire-assembly/build/install/apache-geode/bin/gfsh").toString
   val cacheXMLFile = settings.get("cache-xml-file")
   val numServers: Int = settings.get("num-of-servers").asInstanceOf[String].toInt
   val cwd = new File(".").getAbsolutePath
@@ -29,6 +23,8 @@ class GemFireRunner(settings: Properties) {
 
   def getLocatorPort: Int = locatorPort
 
+  private def getCurrentDirectory = new File( "." ).getCanonicalPath
+  
   private def startGemFireCluster(numServers: Int): Int = {
     //ports(0) for GemFire locator, the other ports are for GemFire servers
     val ports: Seq[Int] = IOUtils.getRandomAvailableTCPPorts(2 + numServers)


Mime
View raw message