You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/14 09:34:42 UTC
[1/2] ignite git commit: ignite-1.5 Increased test timeouts.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 de0b1badb -> 72e5b9adf
ignite-1.5 Increased test timeouts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beb64c34
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beb64c34
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beb64c34
Branch: refs/heads/ignite-1.5
Commit: beb64c34c271b7eac1388179b11f042b34fa0d60
Parents: 4d08673
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 11:34:07 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 11:34:07 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpClientDiscoverySpiMulticastTest.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/beb64c34/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
index 6611e00..27ce883 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
@@ -56,7 +56,11 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
TcpDiscoverySpi spi = new TcpDiscoverySpi();
- spi.setIpFinder(new TcpDiscoveryMulticastIpFinder());
+ TcpDiscoveryMulticastIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder();
+
+ ipFinder.setAddressRequestAttempts(10);
+
+ spi.setIpFinder(ipFinder);
Boolean clientFlag = client.get();
@@ -133,13 +137,13 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
srv.close();
- assertTrue(disconnectLatch.await(10, SECONDS));
+ assertTrue(disconnectLatch.await(30, SECONDS));
discoPort.set(TcpDiscoverySpi.DFLT_PORT + 100);
startGrid(1);
- assertTrue(reconnectLatch.await(10, SECONDS));
+ assertTrue(reconnectLatch.await(30, SECONDS));
}
/**
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72e5b9ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72e5b9ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72e5b9ad
Branch: refs/heads/ignite-1.5
Commit: 72e5b9adfdcfcad4b0002bbfc1cf20fd3a0ed149
Parents: beb64c3 de0b1ba
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 11:34:32 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 11:34:32 2015 +0300
----------------------------------------------------------------------
.../resources/META-INF/classnames.properties | 68 +++++++++++++-------
1 file changed, 44 insertions(+), 24 deletions(-)
----------------------------------------------------------------------