You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/03/18 23:13:06 UTC
incubator-geode git commit: GEODE-936 test now catches expected
DistributedSystemDisconnectedException and ignores.
Repository: incubator-geode
Updated Branches:
refs/heads/develop 57c8600be -> 8645fe038
GEODE-936 test now catches expected DistributedSystemDisconnectedException and ignores.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8645fe03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8645fe03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8645fe03
Branch: refs/heads/develop
Commit: 8645fe03811c9b959e0ea9e6257126ee5e0be255
Parents: 57c8600
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Fri Mar 18 15:12:11 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Fri Mar 18 15:13:19 2016 -0700
----------------------------------------------------------------------
.../internal/deadlock/GemFireDeadlockDetectorDUnitTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8645fe03/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
index 9120366..ac997fe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedLockService;
+import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
import com.gemstone.gemfire.distributed.LockServiceDestroyedException;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.test.dunit.Assert;
@@ -166,7 +167,6 @@ public class GemFireDeadlockDetectorDUnitTest extends CacheTestCase {
assertTrue(deadlock != null);
LogWriterUtils.getLogWriter().info("Deadlock=" + DeadlockDetector.prettyFormat(deadlock));
assertEquals(4, deadlock.size());
- stopStuckThreads();
disconnectAllFromDS();
async1.getResult(30000);
async2.getResult(30000);
@@ -189,6 +189,8 @@ public class GemFireDeadlockDetectorDUnitTest extends CacheTestCase {
dls.lock(second, 10 * 1000, -1);
} catch(LockServiceDestroyedException expected) {
//this is ok, the test is terminating
+ } catch (DistributedSystemDisconnectedException expected) {
+ //this is ok, the test is terminating
}
}