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/10 18:28:27 UTC
[1/2] incubator-ignite git commit: # ignite-648: update
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-648 1e7889b5e -> 77006de66
# ignite-648: update
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/90c39008
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90c39008
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90c39008
Branch: refs/heads/ignite-648
Commit: 90c3900856a6df862a8f3cc6c3880aba82b4ad0c
Parents: 1e7889b
Author: ashutak <as...@gridgain.com>
Authored: Fri Jul 10 18:39:12 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jul 10 18:39:12 2015 +0300
----------------------------------------------------------------------
.../near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90c39008/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
index 20146b8..c592395 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
@@ -115,7 +115,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe
/** {@inheritDoc} */
@Override public void testEvictExpired() throws Exception {
if (isMultiJvm())
- fail("https://issues.apache.org/jira/browse/IGNITE-648");
+ fail("https://issues.apache.org/jira/browse/IGNITE-1113");
IgniteCache<String, Integer> cache = jcache();
[2/2] incubator-ignite git commit: # ignite-648: remove
GridCacheNearTxMultiJvmSelfTest
Posted by sb...@apache.org.
# ignite-648: remove GridCacheNearTxMultiJvmSelfTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77006de6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77006de6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77006de6
Branch: refs/heads/ignite-648
Commit: 77006de66eea4d3a00e7b7a6f3dea300b373a73c
Parents: 90c3900
Author: ashutak <as...@gridgain.com>
Authored: Fri Jul 10 19:28:28 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jul 10 19:28:28 2015 +0300
----------------------------------------------------------------------
.../near/GridCacheNearTxMultiNodeSelfTest.java | 3 --
.../GridCacheNearTxMultiJvmSelfTest.java | 30 --------------------
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 1 -
3 files changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77006de6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index e39a2ef..962e80d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -88,9 +88,6 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
*/
@SuppressWarnings( {"unchecked"})
public void testTxCleanup() throws Exception {
- if (isMultiJvm())
- fail("https://issues.apache.org/jira/browse/IGNITE-648");
-
backups = 1;
Ignite ignite = startGrids(GRID_CNT);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77006de6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java
deleted file mode 100644
index 467e32c..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearTxMultiJvmSelfTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheNearTxMultiJvmSelfTest extends GridCacheNearTxMultiNodeSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77006de6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
index f52c031..fb295f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
@@ -69,7 +69,6 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCacheNearTxMultiJvmSelfTest.class);
suite.addTestSuite(GridCachePartitionedMultiJvmCounterSelfTest.class);
// Multi-node with off-heap values.