You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/02 14:29:31 UTC
incubator-ignite git commit: # ignite-648: disable tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-648 335a3f9c4 -> 44692e32e
# ignite-648: disable 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/44692e32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44692e32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44692e32
Branch: refs/heads/ignite-648
Commit: 44692e32eff1a0d247f59e54379747dee794b55d
Parents: 335a3f9
Author: ashutak <as...@gridgain.com>
Authored: Thu Jul 2 15:29:23 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Thu Jul 2 15:29:23 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 6 +++---
.../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 11 +++++++++++
.../GridCachePartitionedMultiNodeCounterSelfTest.java | 3 +++
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44692e32/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 7ea73a4..4e31771 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
@@ -3187,7 +3187,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param oldEntry {@code True} to check TTL on old entry, {@code false} on new.
* @throws Exception If failed.
*/
- private void checkTtl(boolean inTx, boolean oldEntry) throws Exception {
+ protected void checkTtl(boolean inTx, boolean oldEntry) throws Exception {
if (memoryMode() == OFFHEAP_TIERED)
return;
@@ -4362,8 +4362,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testLocalClearKeys() throws Exception {
- if (isMultiJvm()) // TODO: IGNITE-648, test should be fixed and enabled.
- return;
+ if (isMultiJvm())
+ fail("https://issues.apache.org/jira/browse/IGNITE-648");
Map<String, List<String>> keys = addKeys();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44692e32/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 d40e9e3..60168e1 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
@@ -137,6 +137,14 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
return nearIdx == 0 ? jcache(1) : jcache(0);
}
+ /** {@inheritDoc} */
+ @Override protected void checkTtl(boolean inTx, boolean oldEntry) throws Exception {
+ if (isMultiJvm())
+ fail("https://issues.apache.org/jira/browse/IGNITE-648");
+
+ super.checkTtl(inTx, oldEntry);
+ }
+
/**
* @return For the purpose of this test returns the near-only instance.
*/
@@ -211,6 +219,9 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
* @throws Exception If failed.
*/
private void checkReaderTtl(boolean inTx) throws Exception {
+ if (isMultiJvm())
+ fail("https://issues.apache.org/jira/browse/IGNITE-648");
+
int ttl = 1000;
final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(TimeUnit.MILLISECONDS, ttl));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44692e32/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index fd735c3..5d00e1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -225,6 +225,9 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
* @throws Exception If failed.
*/
private void checkNearAndPrimary(int gridCnt, int priThreads, int nearThreads) throws Exception {
+ if (isMultiJvm())
+ fail("https://issues.apache.org/jira/browse/IGNITE-648");
+
assert gridCnt > 0;
assert priThreads >= 0;
assert nearThreads >= 0;