Repository: ignite Updated Branches: refs/heads/ignite-zk 2283df29b -> 26d12c7c5
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50e9b607 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50e9b607 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50e9b607 Branch: refs/heads/ignite-zk Commit: 50e9b607958534a4d0c08491926afe321ddad0c9 Parents: c1c644b Author: sboikov <[email protected]> Authored: Thu Dec 21 14:54:10 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Dec 21 14:54:56 2017 +0300 ---------------------------------------------------------------------- .../discovery/AuthenticationRestartTest.java | 20 ++++++++++++-------- .../IgniteClientReconnectTestSuite.java | 13 +++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/50e9b607/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java index 5841094..c843685 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java @@ -65,17 +65,21 @@ public class AuthenticationRestartTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClientReconnect() throws Exception { - stopGrid("server"); - final IgniteEx client = grid("client"); - waitForCondition(new GridAbsPredicate() { - @Override public boolean apply() { - return client.cluster().clientReconnectFuture() != null; - } - }, 10_000); + if (tcpDiscovery()) { + stopGrid("server"); - startGrid("server"); + waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return client.cluster().clientReconnectFuture() != null; + } + }, 10_000); + + startGrid("server"); + } + else + reconnectClient(log, client); IgniteFuture<?> fut = client.cluster().clientReconnectFuture(); http://git-wip-us.apache.org/repos/asf/ignite/blob/50e9b607/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java index 5b4461a..d0e907c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java @@ -44,7 +44,20 @@ public class IgniteClientReconnectTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite Client Reconnect Test Suite"); + suite.addTestSuite(IgniteClientConnectAfterCommunicationFailureTest.class); + suite.addTestSuite(IgniteClientReconnectStopTest.class); + suite.addTestSuite(IgniteClientReconnectApiExceptionTest.class); + suite.addTestSuite(IgniteClientReconnectDiscoveryStateTest.class); + suite.addTestSuite(IgniteClientReconnectCacheTest.class); + suite.addTestSuite(IgniteClientReconnectBinaryContexTest.class); + suite.addTestSuite(IgniteClientReconnectContinuousProcessorTest.class); + suite.addTestSuite(IgniteClientReconnectComputeTest.class); + suite.addTestSuite(IgniteClientReconnectAtomicsTest.class); + suite.addTestSuite(IgniteClientReconnectCollectionsTest.class); + suite.addTestSuite(IgniteClientReconnectServicesTest.class); + suite.addTestSuite(IgniteClientReconnectStreamerTest.class); suite.addTestSuite(IgniteClientReconnectFailoverTest.class); + suite.addTestSuite(IgniteClientRejoinTest.class); return suite; }
