diff options
author | witgo <witgo@qq.com> | 2014-06-06 11:45:21 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-06-06 11:45:21 -0700 |
commit | 41c4a33105c74417192925db355019ba1badeab2 (patch) | |
tree | 3ac5e1fb6c93d2b21b6651491b8107e0a17e20a1 /repl/src/test | |
parent | 8d210560be8b143e48abfbaca347f383b5aa4798 (diff) | |
download | spark-41c4a33105c74417192925db355019ba1badeab2.tar.gz spark-41c4a33105c74417192925db355019ba1badeab2.tar.bz2 spark-41c4a33105c74417192925db355019ba1badeab2.zip |
[SPARK-1841]: update scalatest to version 2.1.5
Author: witgo <witgo@qq.com>
Closes #713 from witgo/scalatest and squashes the following commits:
b627a6a [witgo] merge master
51fb3d6 [witgo] merge master
3771474 [witgo] fix RDDSuite
996d6f9 [witgo] fix TimeStampedWeakValueHashMap test
9dfa4e7 [witgo] merge bug
1479b22 [witgo] merge master
29b9194 [witgo] fix code style
022a7a2 [witgo] fix test dependency
a52c0fa [witgo] fix test dependency
cd8f59d [witgo] Merge branch 'master' of https://github.com/apache/spark into scalatest
046540d [witgo] fix RDDSuite.scala
2c543b9 [witgo] fix ReplSuite.scala
c458928 [witgo] update scalatest to version 2.1.5
Diffstat (limited to 'repl/src/test')
-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 7c765edd55..f4ba8d9cc0 100644 --- a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala +++ b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala @@ -67,12 +67,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) } |