Adapts test suites to spark-submit settings

xiliu82 · Jul 24, 2014 · 7755062 · 7755062
1 parent 40bafef
commit 7755062
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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/...server/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala b/...server/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",