Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1420 [created] 3a18fc99e
minor tweaks to tombstone test Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c5329e71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c5329e71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c5329e71 Branch: refs/heads/feature/GEODE-1420 Commit: c5329e71b50a422a4f9b969da066a673e4af56c0 Parents: 087da4e Author: Darrel Schneider <dschnei...@pivotal.io> Authored: Tue Jun 21 16:30:04 2016 -0700 Committer: Darrel Schneider <dschnei...@pivotal.io> Committed: Tue Jun 21 16:30:04 2016 -0700 ---------------------------------------------------------------------- .../gemstone/gemfire/cache30/MultiVMRegionTestCase.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5329e71/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java index a8a512e..f5c6c03 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java @@ -8618,19 +8618,15 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase { public void run() { final long count = CCRegion.getTombstoneCount(); assertEquals("expected "+numEntries+" tombstones", numEntries, count); - // ensure that some GC is performed - due to timing it may not - // be the whole batch, but some amount should be done WaitCriterion waitForExpiration = new WaitCriterion() { @Override public boolean done() { - // TODO: in GEODE-561 this was changed to no longer wait for it - // to go to zero. But I think it should. - return CCRegion.getTombstoneCount() < numEntries; + return CCRegion.getTombstoneCount() == 0; } @Override public String description() { - return "Waiting for some tombstones to expire. There are now " + CCRegion.getTombstoneCount() - + " tombstones left out of " + count + " initial tombstones"; + return "Waiting for all tombstones to expire. There are now " + CCRegion.getTombstoneCount() + + " tombstones left out of " + count + " initial tombstones"; } }; try {
