Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 3c7ff71ab -> aaca0e8b3
# ignite-648: the rest of tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aaca0e8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aaca0e8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aaca0e8b Branch: refs/heads/ignite-648 Commit: aaca0e8b3662dbcfbf5f514abb830039cf961803 Parents: 3c7ff71 Author: ashutak <ashu...@gridgain.com> Authored: Mon Jun 29 22:24:20 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Mon Jun 29 22:24:20 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 3 +++ .../near/GridCachePartitionedMultiNodeFullApiSelfTest.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaca0e8b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index d295be6..9b9c86a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -4723,6 +4723,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testWithSkipStoreRemoveAll() throws Exception { + if (isMultiJvm()) + return; + if (atomicityMode() == TRANSACTIONAL || (atomicityMode() == ATOMIC && nearEnabled())) // TODO IGNITE-373. return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaca0e8b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index 003c186..0232efe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -327,7 +327,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti for (int i = 0; i < gridCount(); i++) { IgniteEx ignite = grid(i); - if (!ignite.configuration().isClientMode()) { + if (!Boolean.TRUE.equals(ignite.configuration().isClientMode())) { if (ignite0 == null) ignite0 = ignite; else if (ignite1 == null) @@ -417,7 +417,8 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti } }; - info("All affinity nodes: " + affinityNodes()); + if (!isMultiJvm()) + info("All affinity nodes: " + affinityNodes()); IgniteCache<Object, Object> cache = grid(0).cache(null);
