Repository: spark Updated Branches: refs/heads/branch-1.6 909231d7a -> 8a2b8fcbb
Change check for particular missing file message to accommodate the message that would occur, it seems, only in Hadoop 1.x (and therefore in Spark 1.x) Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8a2b8fcb Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8a2b8fcb Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8a2b8fcb Branch: refs/heads/branch-1.6 Commit: 8a2b8fcbb05381a5e7de9c1adb85ee167d2fc97e Parents: 909231d Author: Sean Owen <so...@cloudera.com> Authored: Sat Aug 13 16:40:49 2016 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Sat Aug 13 16:40:49 2016 +0100 ---------------------------------------------------------------------- sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8a2b8fcb/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala index be23043..cf98a49 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala @@ -1757,7 +1757,9 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext { val e3 = intercept[AnalysisException] { sql("select * from json.invalid_file") } - assert(e3.message.contains("invalid_file does not exist")) + assert( + e3.message.contains("invalid_file does not exist") || + e3.message.contains("No input paths specified in job")) } test("SortMergeJoin returns wrong results when using UnsafeRows") { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org