Relaxes timeout

Author: liancheng

sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala

@@ -62,10 +62,10 @@ class CliSuite extends FunSuite with BeforeAndAfterAll with Logging {
 
     def captureOutput(source: String)(line: String) {
       buffer += s"$source> $line"
-      if (line.contains(expectedAnswers(next.get()))) {
-        if (next.incrementAndGet() == expectedAnswers.size) {
-          foundAllExpectedAnswers.trySuccess(())
-        }
+      if (next.get() < expectedAnswers.size &&
+        line.startsWith(expectedAnswers(next.get())) &&
+        next.incrementAndGet() == expectedAnswers.size) {
+        foundAllExpectedAnswers.success(())
       }
     }
 
@@ -109,7 +109,7 @@ class CliSuite extends FunSuite with BeforeAndAfterAll with Logging {
     val dataFilePath =
       Thread.currentThread().getContextClassLoader.getResource("data/files/small_kv.txt")
 
-    runCliWithin(1.minute)(
+    runCliWithin(3.minute)(
       "CREATE TABLE hive_test(key INT, val STRING);"
         -> "OK",
       "SHOW TABLES;"

sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala

@@ -43,7 +43,7 @@ class HiveThriftServer2Suite extends FunSuite with Logging {
 
   val verbose = Option(System.getenv("SPARK_SQL_TEST_VERBOSE")).isDefined
 
-  def startThriftServerWithin(timeout: FiniteDuration = 10.seconds)(f: Statement => Unit) {
+  def startThriftServerWithin(timeout: FiniteDuration = 1.minute)(f: Statement => Unit) {
     Thread.sleep(5000)
 
     val startScript = "../../sbin/start-thriftserver.sh".split("/").mkString(File.separator)
@@ -79,15 +79,13 @@ class HiveThriftServer2Suite extends FunSuite with Logging {
     var logFilePath: String = null
 
     def captureLogOutput(line: String): Unit = {
-      logInfo(s"server log | $line")
       buffer += line
       if (line.contains("ThriftBinaryCLIService listening on")) {
         serverRunning.success(())
       }
     }
 
     def captureThriftServerOutput(source: String)(line: String): Unit = {
-      logInfo(s"server $source | $line")
       if (line.startsWith(LOGGING_MARK)) {
         logFilePath = line.drop(LOGGING_MARK.length).trim
         // Ensure that the log file is created so that the `tail' command won't fail