You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2015/02/09 23:58:23 UTC
spark git commit: [SQL] Fix flaky SET test
Repository: spark
Updated Branches:
refs/heads/branch-1.1 03d4097bc -> 651ceaeb3
[SQL] Fix flaky SET test
Author: Michael Armbrust <mi...@databricks.com>
Closes #4480 from marmbrus/fixSetTests and squashes the following commits:
f2e501e [Michael Armbrust] [SQL] Fix flaky SET test
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/651ceaeb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/651ceaeb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/651ceaeb
Branch: refs/heads/branch-1.1
Commit: 651ceaeb31fe8b090d93a714e58a1e4efb58447e
Parents: 03d4097
Author: Michael Armbrust <mi...@databricks.com>
Authored: Mon Feb 9 14:57:55 2015 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Mon Feb 9 14:57:55 2015 -0800
----------------------------------------------------------------------
.../org/apache/spark/sql/hive/execution/HiveQuerySuite.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/651ceaeb/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
index cdf9844..32c2d76 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
@@ -541,8 +541,8 @@ class HiveQuerySuite extends HiveComparisonTest {
sql(s"SET ${testKey + testKey}=${testVal + testVal}")
assert(hiveconf.get(testKey + testKey, "") == testVal + testVal)
- assertResult(Array(s"$testKey=$testVal", s"${testKey + testKey}=${testVal + testVal}")) {
- sql(s"SET").collect().map(_.getString(0))
+ assertResult(Set(s"$testKey=$testVal", s"${testKey + testKey}=${testVal + testVal}")) {
+ sql(s"SET").collect().map(_.getString(0)).toSet
}
assertResult(Set(testKey -> testVal, (testKey + testKey) -> (testVal + testVal))) {
collectResults(sql("SET -v"))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org