Skip to content
Snippets Groups Projects
Commit 2bd04c35 authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Formatting

parent f2263350
No related branches found
No related tags found
No related merge requests found
...@@ -28,8 +28,9 @@ class ReplSuite extends FunSuite { ...@@ -28,8 +28,9 @@ class ReplSuite extends FunSuite {
val separator = System.getProperty("path.separator") val separator = System.getProperty("path.separator")
interp.process(Array("-classpath", paths.mkString(separator))) interp.process(Array("-classpath", paths.mkString(separator)))
spark.repl.Main.interp = null spark.repl.Main.interp = null
if (interp.sparkContext != null) if (interp.sparkContext != null) {
interp.sparkContext.stop() interp.sparkContext.stop()
}
// To avoid Akka rebinding to the same port, since it doesn't unbind immediately on shutdown // To avoid Akka rebinding to the same port, since it doesn't unbind immediately on shutdown
System.clearProperty("spark.driver.port") System.clearProperty("spark.driver.port")
System.clearProperty("spark.hostPort") System.clearProperty("spark.hostPort")
...@@ -37,12 +38,12 @@ class ReplSuite extends FunSuite { ...@@ -37,12 +38,12 @@ class ReplSuite extends FunSuite {
} }
def assertContains(message: String, output: String) { def assertContains(message: String, output: String) {
assert(output contains message, assert(output.contains(message),
"Interpreter output did not contain '" + message + "':\n" + output) "Interpreter output did not contain '" + message + "':\n" + output)
} }
def assertDoesNotContain(message: String, output: String) { def assertDoesNotContain(message: String, output: String) {
assert(!(output contains message), assert(!output.contains(message),
"Interpreter output contained '" + message + "':\n" + output) "Interpreter output contained '" + message + "':\n" + output)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment