Repository: ignite Updated Branches: refs/heads/ignite-gg-11133 a5b932b6e -> 7a3cb0c81
fixed/enabled tests Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a3cb0c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a3cb0c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a3cb0c8 Branch: refs/heads/ignite-gg-11133 Commit: 7a3cb0c81a24def20bbca6f5e5754f7c6c222ea7 Parents: a5b932b Author: sboikov <sboi...@apache.org> Authored: Tue Oct 9 09:58:58 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Tue Oct 9 09:58:58 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 3 ++- .../cache/IgniteCacheConfigVariationsFullApiTest.java | 3 ++- .../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7a3cb0c8/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 9f2364c..371ca9f 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 @@ -6483,7 +6483,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract IgnitePair<Long> pair = new IgnitePair<>(entry.ttl(), entry.expireTime()); - entry.context().cache().removeEntry(entry); + if (!entry.isNear()) + entry.context().cache().removeEntry(entry); return pair; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7a3cb0c8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java index 6f3ead4..e449b3b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java @@ -6317,7 +6317,8 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar IgnitePair<Long> pair = new IgnitePair<>(entry.ttl(), entry.expireTime()); - entry.touch(((IgniteKernal)ignite).context().discovery().topologyVersionEx()); + if (!entry.isNear()) + entry.context().cache().removeEntry(entry); return pair; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7a3cb0c8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index d5850c5..e1ec15b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -213,7 +213,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio */ public void testReaderTtlTx() throws Exception { // IgniteProcessProxy#transactions is not implemented. - if (isMultiJvm()) + if (isMultiJvm() || !txShouldBeUsed()) return; checkReaderTtl(true); @@ -248,7 +248,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio final String key = primaryKeysForCache(fullCache(), 1).get(0); - c.put(key, 1); + fullCache().put(key, 1); info("Finished first put."); @@ -281,6 +281,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio tx.close(); } + jcache(nearIdx).get(key); // Create entry on near node. + long[] expireTimes = new long[gridCount()]; for (int i = 0; i < gridCount(); i++) { @@ -296,7 +298,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio if (entryTtl != null) { assertNotNull(entryTtl.get1()); assertNotNull(entryTtl.get2()); - assertTrue(entryTtl.get2() > startTime); + assertTrue("Invalid expire time [expire=" + entryTtl.get2() + ", start=" + startTime + ']', + entryTtl.get2() > startTime); expireTimes[i] = entryTtl.get2(); } }
