Repository: ignite Updated Branches: refs/heads/master 1db895545 -> 982263e17
CacheExchangeMergeTest: increased timeout Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/982263e1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/982263e1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/982263e1 Branch: refs/heads/master Commit: 982263e17ed537ae66976cbf09bc069b80864355 Parents: 1db8955 Author: sboikov <[email protected]> Authored: Wed Oct 17 08:24:46 2018 +0300 Committer: sboikov <[email protected]> Committed: Wed Oct 17 08:24:46 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/CacheExchangeMergeTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/982263e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index d95a7bf..2e89922 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -93,7 +93,7 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ - private static final long WAIT_SECONDS = 15; + private static final long WAIT_SECONDS = 45; /** */ private ThreadLocal<Boolean> client = new ThreadLocal<>(); @@ -936,8 +936,6 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { Ignite srv0 = startGrids(srvs); - mergeExchangeWaitVersion(srv0, 6); - CountDownLatch latch = blockExchangeFinish(srvs, mode); IgniteInternalFuture<?> fut = startGridsAsync(srv0, srvs, 2);
