aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorZongheng Yang <zongheng.y@gmail.com>2014-06-10 21:59:01 -0700
committerMichael Armbrust <michael@databricks.com>2014-06-10 21:59:01 -0700
commit601032f5bfe2dcdc240bfcc553f401e6facbf5ec (patch)
treec464078974b391166d8732ad51f8cbb7a119e558 /sql
parenta2052a44f3c08076d8d1ac505c8eb5395141bf79 (diff)
downloadspark-601032f5bfe2dcdc240bfcc553f401e6facbf5ec.tar.gz
spark-601032f5bfe2dcdc240bfcc553f401e6facbf5ec.tar.bz2
spark-601032f5bfe2dcdc240bfcc553f401e6facbf5ec.zip
HOTFIX: clear() configs in SQLConf-related unit tests.
Thanks goes to @liancheng, who pointed out that `sql/test-only *.SQLConfSuite *.SQLQuerySuite` passed but `sql/test-only *.SQLQuerySuite *.SQLConfSuite` failed. The reason is that some tests use the same test keys and without clear()'ing, they get carried over to other tests. This hotfix simply adds some `clear()` calls. This problem was not evident on Jenkins before probably because `parallelExecution` is not set to `false` for `sqlCoreSettings`. Author: Zongheng Yang <zongheng.y@gmail.com> Closes #1040 from concretevitamin/sqlconf-tests and squashes the following commits: 6d14ceb [Zongheng Yang] HOTFIX: clear() confs in SQLConf related unit tests.
Diffstat (limited to 'sql')
-rw-r--r--sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala2
-rw-r--r--sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala1
2 files changed, 3 insertions, 0 deletions
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
index 5eb73a4eff..08293f7f0c 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
@@ -28,6 +28,7 @@ class SQLConfSuite extends QueryTest {
val testVal = "test.val.0"
test("programmatic ways of basic setting and getting") {
+ clear()
assert(getOption(testKey).isEmpty)
assert(getAll.toSet === Set())
@@ -48,6 +49,7 @@ class SQLConfSuite extends QueryTest {
}
test("parse SQL set commands") {
+ clear()
sql(s"set $testKey=$testVal")
assert(get(testKey, testVal + "_") == testVal)
assert(TestSQLContext.get(testKey, testVal + "_") == testVal)
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 de02bbc7e4..c1fc99f077 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
@@ -402,6 +402,7 @@ class SQLQuerySuite extends QueryTest {
sql(s"SET $nonexistentKey"),
Seq(Seq(s"$nonexistentKey is undefined"))
)
+ clear()
}
}