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 2396517B32 for ; Mon, 1 Jun 2015 11:45:26 +0000 (UTC) Received: (qmail 65226 invoked by uid 500); 1 Jun 2015 11:45:26 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 65191 invoked by uid 500); 1 Jun 2015 11:45:26 -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 65182 invoked by uid 99); 1 Jun 2015 11:45:25 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 11:45:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 6EB39CA5F3 for ; Mon, 1 Jun 2015 11:45:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id Bz2HHlAUQDUw for ; Mon, 1 Jun 2015 11:45:11 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 1EB7247C3A for ; Mon, 1 Jun 2015 11:44:56 +0000 (UTC) Received: (qmail 60833 invoked by uid 99); 1 Jun 2015 11:44:54 -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; Mon, 01 Jun 2015 11:44:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7543FE050C; Mon, 1 Jun 2015 11:44:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 01 Jun 2015 11:45:33 -0000 Message-Id: <6372de1d263d4606b3e39a9fe4df5482@git.apache.org> In-Reply-To: <79a37b0eafb644bc9db80065f03fc61a@git.apache.org> References: <79a37b0eafb644bc9db80065f03fc61a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [41/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix TcpClientDiscoverySpiSelfTest.testMetrics # IGNITE-943 Fix TcpClientDiscoverySpiSelfTest.testMetrics Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2477c0eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2477c0eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2477c0eb Branch: refs/heads/ignite-sprint-5 Commit: 2477c0ebd2e8003b58e3a83b4389d1118b30b5fc Parents: 1b0a051 Author: sevdokimov Authored: Fri May 29 13:44:29 2015 +0300 Committer: sevdokimov Committed: Fri May 29 13:44:29 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2477c0eb/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 be3474d..f7be340 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 @@ -681,7 +681,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { Ignite g = G.ignite("server-" + i); for (ClusterNode n : g.cluster().nodes()) { - if (n.metrics().getTotalExecutedJobs() != execJobsCnt) + if (n.metrics().getTotalExecutedJobs() != (n.isClient() ? 0 : execJobsCnt)) return false; } } @@ -690,7 +690,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { Ignite g = G.ignite("client-" + i); for (ClusterNode n : g.cluster().nodes()) { - if (n.metrics().getTotalExecutedJobs() != execJobsCnt) + if (n.metrics().getTotalExecutedJobs() != (n.isClient() ? 0 : execJobsCnt)) return false; } }