Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9C1B318017 for ; Mon, 27 Jul 2015 23:19:36 +0000 (UTC) Received: (qmail 24895 invoked by uid 500); 27 Jul 2015 23:19:36 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 24867 invoked by uid 500); 27 Jul 2015 23:19:36 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 24858 invoked by uid 99); 27 Jul 2015 23:19:36 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 23:19:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 2CD28D80E4 for ; Mon, 27 Jul 2015 23:19:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.488 X-Spam-Level: X-Spam-Status: No, score=-0.488 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-1.289, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id qfX2rP-HdyBp for ; Mon, 27 Jul 2015 23:19:25 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 02EDF2D62C for ; Mon, 27 Jul 2015 23:19:24 +0000 (UTC) Received: (qmail 23723 invoked by uid 99); 27 Jul 2015 23:19:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 23:19:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B290CE10A9; Mon, 27 Jul 2015 23:19:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.incubator.apache.org Date: Mon, 27 Jul 2015 23:19:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/50] [abbrv] incubator-geode git commit: GEODE-115 Change gfsh path for integration tests 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/feature/GEODE-77 Commit: 047ef62fa58045880e87b73bb4013dd40ead0e4e Parents: 2793365 Author: Jianxia Chen Authored: Tue Jul 14 15:48:43 2015 -0700 Committer: Jianxia Chen 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)