diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2012-10-02 13:08:01 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2012-10-02 13:08:01 -0700 |
| commit | 0898a21b95f5b3b190aa4d38a3a73c5a0c21eef3 (patch) | |
| tree | 04c05cc4222e67521d08ba566ca705e6526e888e /core/src/test/scala | |
| parent | b8cd6811697f10cd969cfe750f7fd815e0545177 (diff) | |
| parent | a92575467565623752d47ce17a7d39b526505195 (diff) | |
| download | spark-0898a21b95f5b3b190aa4d38a3a73c5a0c21eef3.tar.gz spark-0898a21b95f5b3b190aa4d38a3a73c5a0c21eef3.tar.bz2 spark-0898a21b95f5b3b190aa4d38a3a73c5a0c21eef3.zip | |
Merge branch 'dev' of https://github.com/mesos/spark into dev
Diffstat (limited to 'core/src/test/scala')
| -rw-r--r-- | core/src/test/scala/spark/storage/BlockManagerSuite.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/test/scala/spark/storage/BlockManagerSuite.scala b/core/src/test/scala/spark/storage/BlockManagerSuite.scala index 8f4b9d395f..d15d7285a7 100644 --- a/core/src/test/scala/spark/storage/BlockManagerSuite.scala +++ b/core/src/test/scala/spark/storage/BlockManagerSuite.scala @@ -69,9 +69,9 @@ class BlockManagerSuite extends FunSuite with BeforeAndAfter with PrivateMethodT assert(master.mustGetLocations(GetLocations("a2")).size > 0, "master was not told about a2") assert(master.mustGetLocations(GetLocations("a3")).size === 0, "master was told about a3") - // Drop a1 and a2 from memory; this should be reported back to the master - store.dropFromMemory("a1", null) - store.dropFromMemory("a2", null) + // Setting storage level of a1 and a2 to invalid; they should be removed from store and master + store.setLevelAndTellMaster("a1", new StorageLevel(false, false, false, 1)) + store.setLevelAndTellMaster("a2", new StorageLevel(true, false, false, 0)) assert(store.getSingle("a1") === None, "a1 not removed from store") assert(store.getSingle("a2") === None, "a2 not removed from store") assert(master.mustGetLocations(GetLocations("a1")).size === 0, "master did not remove a1") |