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/06/26 15:26:50 UTC

[4/4] incubator-ignite git commit: # ignite-648: revert 23109364f5989fae4c85fc55cfa941fe46a96e49 (tmp commit)

# ignite-648: revert 23109364f5989fae4c85fc55cfa941fe46a96e49 (tmp commit)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8361e087
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8361e087
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8361e087

Branch: refs/heads/ignite-648-failover
Commit: 8361e087a0886cdb9ada1129caf248e32fcdad38
Parents: 7cf3a66
Author: ashutak <as...@gridgain.com>
Authored: Fri Jun 26 12:39:53 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jun 26 12:39:53 2015 +0300

----------------------------------------------------------------------
 .../GridCacheNearReloadAllMJSelfTest.java       | 30 --------------------
 ...IgniteCacheFullApiMultiJvmSelfTestSuite.java |  2 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8361e087/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearReloadAllMJSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearReloadAllMJSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearReloadAllMJSelfTest.java
deleted file mode 100644
index 9d10440..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheNearReloadAllMJSelfTest.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.*;
-
-/**
- * Multy Jvm tests.
- */
-public class GridCacheNearReloadAllMJSelfTest extends GridCacheNearReloadAllSelfTest {
-    /** {@inheritDoc} */
-    protected boolean isMultiJvm() {
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8361e087/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 37851c1..75d34c4 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,7 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite {
         suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.class);
         suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.class);
 
-        suite.addTestSuite(GridCacheNearReloadAllMJSelfTest.class);
+//        suite.addTestSuite(GridCacheNearReloadAllSelfTest.class);
 //        suite.addTestSuite(GridCacheColocatedReloadAllSelfTest.class);
 //        suite.addTestSuite(GridCacheAtomicReloadAllSelfTest.class);
 //        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.class);