Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5C73A2009C5 for ; Mon, 16 May 2016 14:23:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5B08B160A16; Mon, 16 May 2016 12:23:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A513F1609B0 for ; Mon, 16 May 2016 14:23:51 +0200 (CEST) Received: (qmail 91987 invoked by uid 500); 16 May 2016 12:23:50 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 91978 invoked by uid 99); 16 May 2016 12:23:50 -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, 16 May 2016 12:23:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4C88DFFA9; Mon, 16 May 2016 12:23:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: <0fde242aad2146cfacf000831ef9be21@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-1.6 Fixed test IgniteCacheClientNodeChangingTopologyTest.testLock. Date: Mon, 16 May 2016 12:23:50 +0000 (UTC) archived-at: Mon, 16 May 2016 12:23:52 -0000 Repository: ignite Updated Branches: refs/heads/ignite-1.6 77e06a807 -> 90ae6023c ignite-1.6 Fixed test IgniteCacheClientNodeChangingTopologyTest.testLock. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90ae6023 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90ae6023 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90ae6023 Branch: refs/heads/ignite-1.6 Commit: 90ae6023c4301840100c13e2a494c1c8ce401adf Parents: 77e06a8 Author: sboikov Authored: Mon May 16 15:23:09 2016 +0300 Committer: sboikov Committed: Mon May 16 15:23:42 2016 +0300 ---------------------------------------------------------------------- .../IgniteCacheClientNodeChangingTopologyTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/90ae6023/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index ce883b0..49c3289 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@ -1230,9 +1230,16 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac lockFut.get(); + awaitPartitionMapExchange(); + boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return unlocked(ignite0) && unlocked(ignite1); + for (int i = 0; i < 4; i++) { + if (!unlocked(ignite(i))) + return false; + } + + return true; } private boolean unlocked(Ignite ignite) {