diff options
author | Michael Armbrust <michael@databricks.com> | 2014-06-13 16:09:47 -0700 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2014-06-13 16:09:47 -0700 |
commit | 7e3e9afdb0d89d3d9636e37da6413806d6dc611c (patch) | |
tree | 6792423accea69c0e7a0b1511874330bafb85fa5 /repl | |
parent | 00b4317099f706295909dbe12ef3e141dd590dd1 (diff) | |
download | spark-7e3e9afdb0d89d3d9636e37da6413806d6dc611c.tar.gz spark-7e3e9afdb0d89d3d9636e37da6413806d6dc611c.tar.bz2 spark-7e3e9afdb0d89d3d9636e37da6413806d6dc611c.zip |
[SQL] Update SparkSQL and ScalaTest in branch-1.0 to match master.
#511 and #863 got left out of branch-1.0 since we were really close to the release. Now that they have been tested a little I see no reason to leave them out.
Author: Michael Armbrust <michael@databricks.com>
Author: witgo <witgo@qq.com>
Closes #1078 from marmbrus/branch-1.0 and squashes the following commits:
22be674 [witgo] [SPARK-1841]: update scalatest to version 2.1.5
fc8fc79 [Michael Armbrust] Include #1071 as well.
c5d0adf [Michael Armbrust] Update SparkSQL in branch-1.0 to match master.
Diffstat (limited to 'repl')
-rw-r--r-- | repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala index 95460aa205..95e1793832 100644 --- a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala +++ b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala @@ -57,12 +57,14 @@ class ReplSuite extends FunSuite { } def assertContains(message: String, output: String) { - assert(output.contains(message), + val isContain = output.contains(message) + assert(isContain, "Interpreter output did not contain '" + message + "':\n" + output) } def assertDoesNotContain(message: String, output: String) { - assert(!output.contains(message), + val isContain = output.contains(message) + assert(!isContain, "Interpreter output contained '" + message + "':\n" + output) } |