From 7755062242e03efdf40236ca6764df696cf0f0d9 Mon Sep 17 00:00:00 2001
From: Cheng Lian <lian.cs.zju@gmail.com>
Date: Mon, 21 Jul 2014 11:16:46 +0800
Subject: [PATCH] Adapts test suites to spark-submit settings

---
 .gitignore                                                   | 1 +
 .../org/apache/spark/sql/hive/thriftserver/CliSuite.scala    | 5 +++--
 .../spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 061c8946d23c1..5b56a67c883e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ metastore_db/
 metastore/
 warehouse/
 TempStatsStore/
+sql/hive-thriftserver/test_warehouses
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
index 91634c14949c4..9d2f2296cf02d 100644
--- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
+++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
@@ -31,10 +31,11 @@ class CliSuite extends FunSuite with BeforeAndAfterAll with TestUtils {
   override def beforeAll() {
     val pb = new ProcessBuilder(
       "../../bin/spark-class",
+      "-Dspark.master=local",
       SparkSQLCLIDriver.getClass.getCanonicalName.stripSuffix("$"),
-      "-hiveconf",
+      "--hiveconf",
       s"javax.jdo.option.ConnectionURL=jdbc:derby:;databaseName=$METASTORE_PATH;create=true",
-      "-hiveconf",
+      "--hiveconf",
       "hive.metastore.warehouse.dir=" + WAREHOUSE_PATH)
 
     process = pb.start()
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala
index faf565b639340..6f6d3bad21cc1 100644
--- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala
+++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala
@@ -58,7 +58,8 @@ class HiveThriftServer2Suite extends FunSuite with BeforeAndAfterAll with TestUt
     // hard to clean up Hive resources entirely, so we just start a new process and kill
     // that process for cleanup.
     val defaultArgs = Seq(
-      "../../sbin/start-thriftserver.sh",
+      "../../bin/spark-class",
+      "-Dspark.master=local",
       HiveThriftServer2.getClass.getCanonicalName.stripSuffix("$"),
       "--hiveconf",
       "hive.root.logger=INFO,console",