diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-25 18:37:14 -0400 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-25 18:37:14 -0400 |
commit | 2bd04c3513ffa6deabc290a3931be946b1c18713 (patch) | |
tree | d2709e3f64df9b1e1db4ce56c75a3adbf6194669 /repl/src/test/scala | |
parent | f2263350eda780aba45f383b722e20702c310e6a (diff) | |
download | spark-2bd04c3513ffa6deabc290a3931be946b1c18713.tar.gz spark-2bd04c3513ffa6deabc290a3931be946b1c18713.tar.bz2 spark-2bd04c3513ffa6deabc290a3931be946b1c18713.zip |
Formatting
Diffstat (limited to 'repl/src/test/scala')
-rw-r--r-- | repl/src/test/scala/spark/repl/ReplSuite.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/repl/src/test/scala/spark/repl/ReplSuite.scala b/repl/src/test/scala/spark/repl/ReplSuite.scala index 72ed8aca5b..f46e6d8be4 100644 --- a/repl/src/test/scala/spark/repl/ReplSuite.scala +++ b/repl/src/test/scala/spark/repl/ReplSuite.scala @@ -28,8 +28,9 @@ class ReplSuite extends FunSuite { val separator = System.getProperty("path.separator") interp.process(Array("-classpath", paths.mkString(separator))) spark.repl.Main.interp = null - if (interp.sparkContext != null) + if (interp.sparkContext != null) { interp.sparkContext.stop() + } // To avoid Akka rebinding to the same port, since it doesn't unbind immediately on shutdown System.clearProperty("spark.driver.port") System.clearProperty("spark.hostPort") @@ -37,12 +38,12 @@ class ReplSuite extends FunSuite { } def assertContains(message: String, output: String) { - assert(output contains message, + assert(output.contains(message), "Interpreter output did not contain '" + message + "':\n" + output) } def assertDoesNotContain(message: String, output: String) { - assert(!(output contains message), + assert(!output.contains(message), "Interpreter output contained '" + message + "':\n" + output) } |