Repository: incubator-geode Updated Branches: refs/heads/develop 54050ceb2 -> cdc2519f0
GEODE-345 LocatorDUnitTest.testLeadAndCoordFailure This test seems to have been affected by the recent junit3/4 refactoring. The test framework was trying to destroy regions like this was a CacheTestCase. I've fixed the problem in preTearDown by closing the cache. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cdc2519f Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cdc2519f Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cdc2519f Branch: refs/heads/develop Commit: cdc2519f06138b6a9bbb95cccf5e772568ac2cab Parents: 54050ce Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Tue Mar 22 13:58:42 2016 -0700 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Tue Mar 22 14:02:29 2016 -0700 ---------------------------------------------------------------------- .../java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cdc2519f/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java index f6dfde4..2d0451a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java @@ -43,6 +43,7 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.membership.GMSJo import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.logging.InternalLogWriter; import com.gemstone.gemfire.internal.logging.LocalLogWriter; import com.gemstone.gemfire.internal.tcp.Connection; @@ -106,6 +107,10 @@ public class LocatorDUnitTest extends DistributedTestCase { if (Locator.hasLocator()) { Locator.getLocator().stop(); } + GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); + if (cache != null && !cache.isClosed()) { + cache.close(); + } // delete locator state files so they don't accidentally // get used by other tests if (port1 > 0) {