Update test timeout and comment.

apache · Jun 19, 2015 · 37bb3db · 37bb3db
1 parent 8762eec
commit 37bb3db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveShim.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveShim.scala
@@ -168,7 +168,7 @@ private[client] class Shim_v0_12 extends Shim {
     // Starting from Hive 0.13, setCurrentSessionState will internally override
     // the context class loader of the current thread by the class loader set in
     // the conf of the SessionState. So, for this Hive 0.12 shim, we add the same
-    // behavior. So, shim.setCurrentSessionState of all Hive versions have the
+    // behavior and make shim.setCurrentSessionState of all Hive versions have the
     // consistent behavior.
     Thread.currentThread().setContextClassLoader(state.getConf.getClassLoader)
     startMethod.invoke(null, state)

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
@@ -74,7 +74,7 @@ class HiveSparkSubmitSuite
       new File(sparkHome),
       Map("SPARK_TESTING" -> "1", "SPARK_HOME" -> sparkHome))
     try {
-      val exitCode = failAfter(60 seconds) { process.waitFor() }
+      val exitCode = failAfter(120 seconds) { process.waitFor() }
       if (exitCode != 0) {
         fail(s"Process returned with exit code $exitCode. See the log4j logs for more detail.")
       }