Skip to content

Commit f089e2b

Browse files
author
Andrew Or
committed
Fix tests round 3 (small round)
1 parent 193d93c commit f089e2b

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/CatalogTestCases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ abstract class CatalogTestCases extends SparkFunSuite with BeforeAndAfterEach {
231231

232232
test("list tables with pattern") {
233233
val catalog = newBasicCatalog()
234-
intercept[AnalysisException] { catalog.listTables("unknown_db") }
234+
assert(catalog.listTables("unknown_db").isEmpty)
235235
assert(catalog.listTables("db1", "*").toSet == Set.empty)
236236
assert(catalog.listTables("db2", "*").toSet == Set("tbl1", "tbl2"))
237237
assert(catalog.listTables("db2", "tbl*").toSet == Set("tbl1", "tbl2"))

sql/hive/src/test/scala/org/apache/spark/sql/hive/MetastoreDataSourcesSuite.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,8 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
461461
// Drop table will also delete the data.
462462
sql("DROP TABLE savedJsonTable")
463463
intercept[AnalysisException] {
464-
read.json(sessionState.catalog.hiveDefaultTableFilePath(
465-
TableIdentifier("savedJsonTable")))
464+
read.json(
465+
sessionState.catalog.hiveDefaultTableFilePath(TableIdentifier("savedJsonTable")))
466466
}
467467
}
468468

@@ -728,8 +728,7 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
728728
outputFormat = None,
729729
serde = None,
730730
serdeProperties = Map(
731-
"path" ->
732-
sessionState.catalog.hiveDefaultTableFilePath(TableIdentifier(tableName)))
731+
"path" -> sessionState.catalog.hiveDefaultTableFilePath(TableIdentifier(tableName)))
733732
),
734733
properties = Map(
735734
"spark.sql.sources.provider" -> "json",

sql/hive/src/test/scala/org/apache/spark/sql/sources/BucketedWriteSuite.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ class BucketedWriteSuite extends QueryTest with SQLTestUtils with TestHiveSingle
7070

7171
def tableDir: File = {
7272
val identifier = hiveContext.sessionState.sqlParser.parseTableIdentifier("bucketed_table")
73-
new File(URI.create(
74-
hiveContext.sessionState.catalog.hiveDefaultTableFilePath(identifier)))
73+
new File(URI.create(hiveContext.sessionState.catalog.hiveDefaultTableFilePath(identifier)))
7574
}
7675

7776
/**

0 commit comments

Comments
 (0)