diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-05-04 22:26:35 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-05-04 22:26:35 -0700 |
commit | c74ce606a3bbeb81f5537a47584f5793155b75f7 (patch) | |
tree | ffe5c79e5b48f11340548bb799f9a762df981844 | |
parent | 3bf2c868c311f6afd286d7a25adda9fe94561eb0 (diff) | |
parent | 0a2bed356b9ea604d317be97a6747588c5af29e4 (diff) | |
download | spark-c74ce606a3bbeb81f5537a47584f5793155b75f7.tar.gz spark-c74ce606a3bbeb81f5537a47584f5793155b75f7.tar.bz2 spark-c74ce606a3bbeb81f5537a47584f5793155b75f7.zip |
Merge pull request #598 from rxin/blockmanager
Fixed flaky unpersist test in DistributedSuite.
-rw-r--r-- | core/src/test/scala/spark/DistributedSuite.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/src/test/scala/spark/DistributedSuite.scala b/core/src/test/scala/spark/DistributedSuite.scala index ab3e197035..4df3bb5b67 100644 --- a/core/src/test/scala/spark/DistributedSuite.scala +++ b/core/src/test/scala/spark/DistributedSuite.scala @@ -261,9 +261,9 @@ class DistributedSuite extends FunSuite with ShouldMatchers with BeforeAndAfter val data = sc.parallelize(Seq(true, false, false, false), 4) data.persist(StorageLevel.MEMORY_ONLY_2) data.count - assert(sc.persistentRdds.isEmpty == false) + assert(sc.persistentRdds.isEmpty === false) data.unpersist() - assert(sc.persistentRdds.isEmpty == true) + assert(sc.persistentRdds.isEmpty === true) failAfter(Span(3000, Millis)) { try { @@ -271,12 +271,11 @@ class DistributedSuite extends FunSuite with ShouldMatchers with BeforeAndAfter Thread.sleep(200) } } catch { - case e: Exception => + case _ => { Thread.sleep(10) } // Do nothing. We might see exceptions because block manager // is racing this thread to remove entries from the driver. } } - assert(sc.getRDDStorageInfo.isEmpty == true) } } |