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/05/19 21:39:59 UTC
[07/11] incubator-ignite git commit: # IGNITE-709 Bug fix: don't
override joinTimeout in GridAbstractTest.optimize()
# IGNITE-709 Bug fix: don't override joinTimeout in GridAbstractTest.optimize()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8972acdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8972acdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8972acdb
Branch: refs/heads/ignite-23
Commit: 8972acdbfa28e45bcb0dfaf6feb13d548445976b
Parents: c3744ba
Author: sevdokimov <se...@gridgain.com>
Authored: Tue May 19 12:06:11 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue May 19 12:06:11 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8972acdb/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 294595d..be849f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -679,7 +679,8 @@ public abstract class GridAbstractTest extends TestCase {
if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpiAdapter) {
cfg.setLocalHost("127.0.0.1");
- ((TcpDiscoverySpiAdapter)cfg.getDiscoverySpi()).setJoinTimeout(5000);
+ if (((TcpDiscoverySpiAdapter)cfg.getDiscoverySpi()).getJoinTimeout() == 0)
+ ((TcpDiscoverySpiAdapter)cfg.getDiscoverySpi()).setJoinTimeout(8000);
}
else
cfg.setLocalHost(getTestResources().getLocalHost());