Repository: ignite Updated Branches: refs/heads/ignite-zk 9d773539f -> 4ee1e8718
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ee1e871 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ee1e871 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ee1e871 Branch: refs/heads/ignite-zk Commit: 4ee1e8718173cbd0684d1af4a0ab9ba47e4d9d00 Parents: 9d77353 Author: sboikov <[email protected]> Authored: Fri Dec 1 12:05:41 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Dec 1 12:13:20 2017 +0300 ---------------------------------------------------------------------- .../dht/GridCacheDhtPreloadMultiThreadedSelfTest.java | 4 ++++ .../cache/distributed/dht/GridCacheDhtPreloadSelfTest.java | 2 ++ .../apache/ignite/testframework/junits/GridAbstractTest.java | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4ee1e871/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java index e3fa116..60f2f0a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java @@ -116,6 +116,8 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract @Nullable @Override public Object call() throws Exception { IgniteConfiguration cfg = loadConfiguration("modules/core/src/test/config/spring-multicache.xml"); + cfg.setGridLogger(getTestResources().getLogger()); + startGrid(Thread.currentThread().getName(), cfg); return null; @@ -161,6 +163,8 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = loadConfiguration("modules/core/src/test/config/spring-multicache.xml"); + cfg.setGridLogger(getTestResources().getLogger()); + cfg.setIgniteInstanceName(igniteInstanceName); for (CacheConfiguration cCfg : cfg.getCacheConfiguration()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/4ee1e871/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 05a9759..ed5406f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -308,6 +308,8 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all left nodes. checkActiveState(ignites); + + awaitPartitionMapExchange(); // Need wait, otherwise test logic is broken if node fail exchanges are merged. } info("Waiting for preload futures: " + F.view(futs, new IgnitePredicate<IgniteFuture<?>>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/4ee1e871/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 8990570..149ed54 100755 --- 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 @@ -1242,7 +1242,11 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. */ protected Ignite startGrid(String igniteInstanceName, String springCfgPath) throws Exception { - return startGrid(igniteInstanceName, loadConfiguration(springCfgPath)); + IgniteConfiguration cfg = loadConfiguration(springCfgPath); + + cfg.setGridLogger(getTestResources().getLogger()); + + return startGrid(igniteInstanceName, cfg); } /**
