diff options
author | Denny <dennybritz@gmail.com> | 2012-07-18 13:09:50 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-07-23 16:29:17 -0700 |
commit | 866e6949df8cdba0a4da20a1045333e419ed0e12 (patch) | |
tree | 85130d97a539174eec0173ca87a9f1ff795a20ca /bagel/src/test/scala | |
parent | 600e99728dc983e520e0a1b82b3f46e50f1dfac5 (diff) | |
download | spark-866e6949df8cdba0a4da20a1045333e419ed0e12.tar.gz spark-866e6949df8cdba0a4da20a1045333e419ed0e12.tar.bz2 spark-866e6949df8cdba0a4da20a1045333e419ed0e12.zip |
Always destroy SparkContext in after block for the unit tests.
Conflicts:
core/src/test/scala/spark/ShuffleSuite.scala
Diffstat (limited to 'bagel/src/test/scala')
-rw-r--r-- | bagel/src/test/scala/bagel/BagelSuite.scala | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/bagel/src/test/scala/bagel/BagelSuite.scala b/bagel/src/test/scala/bagel/BagelSuite.scala index 0eda80af64..5ac7f5d381 100644 --- a/bagel/src/test/scala/bagel/BagelSuite.scala +++ b/bagel/src/test/scala/bagel/BagelSuite.scala @@ -1,6 +1,6 @@ package spark.bagel -import org.scalatest.{FunSuite, Assertions} +import org.scalatest.{FunSuite, Assertions, BeforeAndAfter} import org.scalatest.prop.Checkers import org.scalacheck.Arbitrary._ import org.scalacheck.Gen @@ -13,9 +13,16 @@ import spark._ class TestVertex(val active: Boolean, val age: Int) extends Vertex with Serializable class TestMessage(val targetId: String) extends Message[String] with Serializable -class BagelSuite extends FunSuite with Assertions { +class BagelSuite extends FunSuite with Assertions with BeforeAndAfter{ + + var sc: SparkContext = _ + + after{ + sc.stop() + } + test("halting by voting") { - val sc = new SparkContext("local", "test") + sc = new SparkContext("local", "test") val verts = sc.parallelize(Array("a", "b", "c", "d").map(id => (id, new TestVertex(true, 0)))) val msgs = sc.parallelize(Array[(String, TestMessage)]()) val numSupersteps = 5 @@ -26,11 +33,10 @@ class BagelSuite extends FunSuite with Assertions { } for ((id, vert) <- result.collect) assert(vert.age === numSupersteps) - sc.stop() } test("halting by message silence") { - val sc = new SparkContext("local", "test") + sc = new SparkContext("local", "test") val verts = sc.parallelize(Array("a", "b", "c", "d").map(id => (id, new TestVertex(false, 0)))) val msgs = sc.parallelize(Array("a" -> new TestMessage("a"))) val numSupersteps = 5 @@ -48,6 +54,5 @@ class BagelSuite extends FunSuite with Assertions { } for ((id, vert) <- result.collect) assert(vert.age === numSupersteps) - sc.stop() } } |