Skip to content

Commit 7ab7599

Browse files
committed
Update CliSuite.scala
1 parent 547e92e commit 7ab7599

File tree

1 file changed

+4
-1
lines changed
  • sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ class CliSuite extends SparkFunSuite with BeforeAndAfterAll with Logging {
136136
val lock = new Object
137137

138138
def captureOutput(source: String)(line: String): Unit = lock.synchronized {
139+
println(line)
139140
// This test suite sometimes gets extremely slow out of unknown reason on Jenkins. Here we
140141
// add a timestamp to provide more diagnosis information.
141142
val newLine = s"${new Timestamp(new Date().getTime)} - $source> $line"
@@ -147,7 +148,9 @@ class CliSuite extends SparkFunSuite with BeforeAndAfterAll with Logging {
147148
}
148149

149150
// If we haven't found all expected answers and another expected answer comes up...
150-
if (next < expectedAnswers.size && line.contains(expectedAnswers(next))) {
151+
if
152+
(next < expectedAnswers.size && !line.contains("spark-sql>") &&
153+
line.contains(expectedAnswers(next))) {
151154
log.info(s"$source> found expected output line $next: '${expectedAnswers(next)}'")
152155
next += 1
153156
// If all expected answers have been found...

0 commit comments

Comments
 (0)