IGNITE-264 - Fixing tests WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d3a15fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d3a15fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d3a15fa Branch: refs/heads/ignite-264 Commit: 3d3a15fa72c2b882afa81aa1ea87a24579f2bdff Parents: b0e6f29 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Aug 11 16:41:38 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Aug 11 16:41:38 2015 -0700 ---------------------------------------------------------------------- .../cache/CacheStoreUsageMultinodeAbstractTest.java | 12 +++++++++--- .../distributed/GridCacheTransformEventSelfTest.java | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d3a15fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java index 79a0293..7eef248 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java @@ -212,10 +212,16 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs Transaction tx = tc != null ? ignite.transactions().txStart(tc, REPEATABLE_READ) : null; - cache.put(key, key); + try { + cache.put(key, key); - if (tx != null) - tx.commit(); + if (tx != null) + tx.commit(); + } + finally { + if (tx != null) + tx.close(); + } boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d3a15fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index 459e015..bec43d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -165,6 +165,9 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { startGrids(GRID_CNT); + if (cacheMode == REPLICATED) + awaitPartitionMapExchange(); + ignites = new Ignite[GRID_CNT]; ids = new UUID[GRID_CNT]; caches = new IgniteCache[GRID_CNT];
