aboutsummaryrefslogtreecommitdiff
path: root/R/pkg/inst/tests/testthat/test_sparkSQL.R
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2016-03-24 22:59:35 -0700
committerAndrew Or <andrew@databricks.com>2016-03-24 22:59:35 -0700
commit20ddf5fddf40b543edc61d6e4687988489dea64c (patch)
tree9bfac66a6e754af29b06ce5529a473795c005a8e /R/pkg/inst/tests/testthat/test_sparkSQL.R
parent1c70b7650f21fc51a07db1e4f28cebbc1fb47e94 (diff)
downloadspark-20ddf5fddf40b543edc61d6e4687988489dea64c.tar.gz
spark-20ddf5fddf40b543edc61d6e4687988489dea64c.tar.bz2
spark-20ddf5fddf40b543edc61d6e4687988489dea64c.zip
[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 <andrew@databricks.com> Closes #11938 from andrewor14/session-catalog-again.
Diffstat (limited to 'R/pkg/inst/tests/testthat/test_sparkSQL.R')
-rw-r--r--R/pkg/inst/tests/testthat/test_sparkSQL.R3
1 files changed, 2 insertions, 1 deletions
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))