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 488B817F0A for ; Wed, 22 Apr 2015 16:02:47 +0000 (UTC) Received: (qmail 44661 invoked by uid 500); 22 Apr 2015 16:02:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 44593 invoked by uid 500); 22 Apr 2015 16:02:47 -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 44567 invoked by uid 99); 22 Apr 2015 16:02:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 16:02:47 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 16:02:39 +0000 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 4F86943E72 for ; Wed, 22 Apr 2015 16:02:18 +0000 (UTC) Received: (qmail 43481 invoked by uid 99); 22 Apr 2015 16:02:17 -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; Wed, 22 Apr 2015 16:02:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB70DE0254; Wed, 22 Apr 2015 16:02:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 22 Apr 2015 16:02:27 -0000 Message-Id: <423bcbf91437495dba7ac62e464d6d74@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/45] incubator-ignite git commit: # Fix GridCachePartitionNotLoadedEventSelfTest: use ipFinder. X-Virus-Checked: Checked by ClamAV on apache.org # Fix GridCachePartitionNotLoadedEventSelfTest: use ipFinder. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b57db0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b57db0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b57db0d Branch: refs/heads/ignite-gg-10115 Commit: 6b57db0d9945a9b7b12134ba9beab51b15f58b56 Parents: bc025d9 Author: sevdokimov Authored: Tue Apr 21 11:51:30 2015 +0300 Committer: sevdokimov Committed: Tue Apr 21 11:51:30 2015 +0300 ---------------------------------------------------------------------- .../GridCachePartitionNotLoadedEventSelfTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b57db0d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java index b2381f3..9d16030 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java @@ -23,6 +23,9 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import org.eclipse.jetty.util.*; @@ -33,12 +36,19 @@ import java.util.*; */ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstractTest { /** */ + private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + + /** */ private int backupCnt; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); + disco.setIpFinder(ipFinder); + cfg.setDiscoverySpi(disco); + if (gridName.matches(".*\\d")) { String idStr = UUID.randomUUID().toString();