You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/26 07:33:37 UTC

[04/12] ignite git commit: ignite-5955 Skip disconnected clients in GridAbstractTest.awaitTopologyChange

ignite-5955 Skip disconnected clients in GridAbstractTest.awaitTopologyChange


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/100bf0b2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/100bf0b2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/100bf0b2

Branch: refs/heads/ignite-zk
Commit: 100bf0b215da595de0a4624a08b11f5e11da88f6
Parents: 5439eb2
Author: Evgeny Stanilovskiy <es...@gridgain.com>
Authored: Mon Dec 25 13:32:01 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 25 13:32:01 2017 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/testframework/junits/GridAbstractTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/100bf0b2/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 4965d16..7e4b501 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -119,6 +119,7 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_CLIENT_CACHE_CHANG
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.internal.GridKernalState.DISCONNECTED;
 import static org.apache.ignite.testframework.config.GridTestProperties.BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER;
 
 /**
@@ -2102,7 +2103,7 @@ public abstract class GridAbstractTest extends TestCase {
         for (Ignite g : G.allGrids()) {
             final GridKernalContext ctx = ((IgniteKernal)g).context();
 
-            if (ctx.isStopping() || !g.active())
+            if (ctx.isStopping() || ctx.gateway().getState() == DISCONNECTED || !g.active())
                 continue;
 
             AffinityTopologyVersion topVer = ctx.discovery().topologyVersionEx();