Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D4D0218F24 for ; Thu, 11 Jun 2015 21:17:36 +0000 (UTC) Received: (qmail 36038 invoked by uid 500); 11 Jun 2015 21:17:36 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35953 invoked by uid 500); 11 Jun 2015 21:17:36 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 35851 invoked by uid 99); 11 Jun 2015 21:17:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2015 21:17:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 11 Jun 2015 21:15:25 +0000 Received: (qmail 33327 invoked by uid 99); 11 Jun 2015 21:17:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2015 21:17:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FB43E0055; Thu, 11 Jun 2015 21:17:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 11 Jun 2015 21:17:13 -0000 Message-Id: <5ca7627332024bc28cb91d8a332191d2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] incubator-ignite git commit: ignite-998 X-Virus-Checked: Checked by ClamAV on apache.org ignite-998 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46e6c48e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46e6c48e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46e6c48e Branch: refs/heads/ignite-484-1 Commit: 46e6c48ee59a3837c06564d2431caabc55cf9a63 Parents: c47438e Author: sboikov Authored: Wed Jun 10 15:33:01 2015 +0300 Committer: sboikov Committed: Wed Jun 10 15:33:01 2015 +0300 ---------------------------------------------------------------------- .../discovery/tcp/TcpClientDiscoverySpiSelfTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46e6c48e/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java index ece898d..55a14e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java @@ -1136,6 +1136,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { * @param clientCnt Number of client nodes. */ private void checkNodes(int srvCnt, int clientCnt) { + long topVer = -1; + for (int i = 0; i < srvCnt; i++) { Ignite g = G.ignite("server-" + i); @@ -1144,6 +1146,11 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { assertFalse(g.cluster().localNode().isClient()); checkRemoteNodes(g, srvCnt + clientCnt - 1); + + if (topVer < 0) + topVer = g.cluster().topologyVersion(); + else + assertEquals(topVer, g.cluster().topologyVersion()); } for (int i = 0; i < clientCnt; i++) { @@ -1156,6 +1163,11 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { assertTrue(g.cluster().localNode().isClient()); checkRemoteNodes(g, srvCnt + clientCnt - 1); + + if (topVer < 0) + topVer = g.cluster().topologyVersion(); + else + assertEquals(topVer, g.cluster().topologyVersion()); } }