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 144B818FE1 for ; Mon, 20 Jul 2015 14:05:34 +0000 (UTC) Received: (qmail 65153 invoked by uid 500); 20 Jul 2015 13:58:51 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 65121 invoked by uid 500); 20 Jul 2015 13:58:51 -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 65112 invoked by uid 99); 20 Jul 2015 13:58:51 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2015 13:58:51 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 11F001A74B4 for ; Mon, 20 Jul 2015 13:58:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Wb8G76BJLlyN for ; Mon, 20 Jul 2015 13:58:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id ED3BE23117 for ; Mon, 20 Jul 2015 13:58:40 +0000 (UTC) Received: (qmail 64990 invoked by uid 99); 20 Jul 2015 13:58:40 -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, 20 Jul 2015 13:58:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 058E6E0522; Mon, 20 Jul 2015 13:58:40 +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 Message-Id: <92dec7c8ee874777a3ee39ac3d6d4aad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: ignite-709: adjusted tests Date: Mon, 20 Jul 2015 13:58:40 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/ignite-1003 632a9c7f0 -> ad8ae4b3c ignite-709: adjusted 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/ad8ae4b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad8ae4b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad8ae4b3 Branch: refs/heads/ignite-1003 Commit: ad8ae4b3c64f7739a0b0349990cd10bdf1f81c45 Parents: 632a9c7 Author: Denis Magda Authored: Mon Jul 20 16:58:06 2015 +0300 Committer: Denis Magda Committed: Mon Jul 20 16:58:06 2015 +0300 ---------------------------------------------------------------------- .../tcp/TcpDiscoveryMultiThreadedTest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad8ae4b3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index 46207e5..e977bed 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -80,13 +80,11 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { cfg.setClientMode(true); ArrayList srvAddresses = new ArrayList<>(); - srvAddresses.add("192.168.56.1:47500"); - srvAddresses.add("192.168.56.1:47501"); - srvAddresses.add("192.168.56.1:47502"); - srvAddresses.add("192.168.56.1:47503"); - srvAddresses.add("192.168.56.1:47504"); - srvAddresses.add("192.168.56.1:47505"); - srvAddresses.add("192.168.56.1:47506"); + + String addr = "192.168.56.1"; + + for (int i = 0; i < 8; i++) + srvAddresses.add(addr + ":4750" + i); ipFinder.setAddresses(srvAddresses); @@ -95,7 +93,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { } else cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(10_000). - setSocketTimeout(10_000).setHeartbeatFrequency(10_000).setLocalAddress("192.168.56.1")); + setSocketTimeout(10_000).setHeartbeatFrequency(10_000)); TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); commSpi.setConnectTimeout(10_000); @@ -112,6 +110,10 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { return cfg; } + @Override protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException { + return cfg; + } + /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { super.afterTest();