Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update
  • Loading branch information
WeichenXu123 committed Dec 25, 2017
commit 7bc588a1122fb8eb3d8c2482da9e34477d4e2cc2
Original file line number Diff line number Diff line change
Expand Up @@ -637,17 +637,13 @@ trait StreamTest extends QueryTest with SharedSQLContext with TimeLimits with Be
error => failTest(error)
}

<<<<<<< HEAD
case CheckAnswerRowsByFunc(checkFunction, globalCheckFunction, lastOnly) =>
=======
case CheckAnswerRowsContains(expectedAnswer, lastOnly) =>
val sparkAnswer = fetchStreamAnswer(currentStream, lastOnly)
QueryTest.includesRows(expectedAnswer, sparkAnswer).foreach {
error => failTest(error)
}

case CheckAnswerRowsByFunc(checkFunction, lastOnly) =>
>>>>>>> master
case CheckAnswerRowsByFunc(checkFunction, globalCheckFunction, lastOnly) =>
val sparkAnswer = fetchStreamAnswer(currentStream, lastOnly)
if (checkFunction != null) {
sparkAnswer.foreach { row =>
Expand Down