From 20ddf5fddf40b543edc61d6e4687988489dea64c Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Thu, 24 Mar 2016 22:59:35 -0700 Subject: [SPARK-14014][SQL] Integrate session catalog (attempt #2) ## What changes were proposed in this pull request? This reopens #11836, which was merged but promptly reverted because it introduced flaky Hive tests. ## How was this patch tested? See `CatalogTestCases`, `SessionCatalogSuite` and `HiveContextSuite`. Author: Andrew Or Closes #11938 from andrewor14/session-catalog-again. --- R/pkg/inst/tests/testthat/test_sparkSQL.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'R/pkg/inst/tests') diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R index 63acbadfa6..eef365b42e 100644 --- a/R/pkg/inst/tests/testthat/test_sparkSQL.R +++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R @@ -1817,7 +1817,8 @@ test_that("approxQuantile() on a DataFrame", { test_that("SQL error message is returned from JVM", { retError <- tryCatch(sql(sqlContext, "select * from blah"), error = function(e) e) - expect_equal(grepl("Table not found: blah", retError), TRUE) + expect_equal(grepl("Table not found", retError), TRUE) + expect_equal(grepl("blah", retError), TRUE) }) irisDF <- suppressWarnings(createDataFrame(sqlContext, iris)) -- cgit v1.2.3