Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 274679d74 -> 2546ac728
minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2546ac72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2546ac72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2546ac72 Branch: refs/heads/sprint-1 Commit: 2546ac7289cb91b7ade2a76470ca8a2d643f10de Parents: 274679d Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Sun Feb 15 22:56:07 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Sun Feb 15 22:56:07 2015 +0300 ---------------------------------------------------------------------- .../p2p/GridAbstractMultinodeRedeployTest.java | 23 ++------------------ 1 file changed, 2 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2546ac72/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java index bb66ef1..ff4dd7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java @@ -54,25 +54,6 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest return cfg; } - /** {@inheritDoc} */ - @Override protected long getTestTimeout() { - return getTestDurationInSeconds() * 2 * 1000; - } - - /** - * @return Time for load test in seconds. - */ - private int getTestDurationInSeconds() { - return 30; - } - - /** - * @return Number of threads for the test. - */ - private int getThreadCount() { - return 10; - } - /** * @param depMode deployment mode. * @throws Throwable If task execution failed. @@ -99,8 +80,8 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest ignite2.cluster().localNode().id(), ignite3.cluster().localNode().id())); - Integer res1 = fut1.get(); - Integer res2 = fut2.get(); + Integer res1 = fut1.get(1000); + Integer res2 = fut2.get(1000); if (res1 == null || res2 == null) throw new IgniteCheckedException("Received wrong result.");
