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 802EA18997 for ; Thu, 23 Jul 2015 14:05:45 +0000 (UTC) Received: (qmail 65474 invoked by uid 500); 23 Jul 2015 14:05:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 65443 invoked by uid 500); 23 Jul 2015 14:05:45 -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 65434 invoked by uid 99); 23 Jul 2015 14:05:45 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 14:05:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id D91E5C0708 for ; Thu, 23 Jul 2015 14:05:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id J9_OrBeZEkoy for ; Thu, 23 Jul 2015 14:05:33 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 8592E215E2 for ; Thu, 23 Jul 2015 14:05:29 +0000 (UTC) Received: (qmail 63710 invoked by uid 99); 23 Jul 2015 14:05:29 -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, 23 Jul 2015 14:05:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A792E6836; Thu, 23 Jul 2015 14:05:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 23 Jul 2015 14:05:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/50] incubator-ignite git commit: #master: fix affinityCall tests. #master: fix affinityCall tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ae5ce63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ae5ce63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ae5ce63 Branch: refs/heads/ignite-1108 Commit: 7ae5ce63fa09da0f3b9c25f77090f8091c6455a5 Parents: 3194415 Author: ivasilinets Authored: Mon Jul 20 18:25:35 2015 +0300 Committer: ivasilinets Committed: Mon Jul 20 18:25:35 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheAffinityCallSelfTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ae5ce63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java index c4436ca..90160e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java @@ -45,7 +45,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest { private static final String CACHE_NAME = "myCache"; /** */ - private static final int MAX_FAILOVER_ATTEMPTS = 5; + private static final int MAX_FAILOVER_ATTEMPTS = 105; /** */ private static final int SERVERS_COUNT = 4; @@ -81,7 +81,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { + @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); } @@ -138,10 +138,16 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest { assertTrue(e.getMessage().contains("Topology projection is empty")); } catch(IgniteException e) { - assertTrue(e.getMessage().contains("cache (or node) is stopping")); + assertTrue(e.getMessage().contains("Client node disconnected") || + e.getMessage().contains("Failed to reconnect to cluster") || + e.getMessage().contains("Failed to execute task, client node disconnected.")); } + startGrid(0); + stopGrid(SERVERS_COUNT); + + stopGrid(0); } /**