You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/07/05 22:05:14 UTC
[4/9] incubator-geode git commit: minor tweaks to tombstone test
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/83c49405
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/83c49405
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/83c49405
Branch: refs/heads/develop
Commit: 83c4940544e2006e02106953493e9b4a7d390b5c
Parents: ea1f4ae
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jun 21 16:30:04 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jul 5 14:30:09 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/83c49405/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 {