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 2019/01/28 11:19:09 UTC
[ignite] branch ignite-1090 created (now cd6e9c0)
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a change to branch ignite-1090
in repository https://gitbox.apache.org/repos/asf/ignite.git.
at cd6e9c0 ignite-1090
This branch includes the following new commits:
new cd6e9c0 ignite-1090
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ignite] 01/01: ignite-1090
Posted by sb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-1090
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit cd6e9c069cd9280d3de375b41de3dcf7565034f7
Author: sboikov <sb...@apache.org>
AuthorDate: Mon Jan 28 14:18:40 2019 +0300
ignite-1090
---
.../near/GridCachePartitionedOptimisticTxNodeRestartTest.java | 6 ------
.../cache/distributed/near/NearCacheMultithreadedUpdateTest.java | 2 +-
.../org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java | 7 ++-----
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
index a126843..ad55c94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
@@ -23,7 +23,6 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheAbstractNodeRestartSelfTest;
import org.apache.ignite.transactions.TransactionConcurrency;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -38,11 +37,6 @@ import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
@RunWith(JUnit4.class)
public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAbstractNodeRestartSelfTest {
/** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-1090", nearEnabled());
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
index 08b7027..6a2ff43 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
@@ -46,7 +46,7 @@ public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest {
private boolean client;
/** */
- private final int SRV_CNT = 3;
+ private static final int SRV_CNT = 3;
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
index 4e96305..0fa14ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
@@ -22,6 +22,7 @@ import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheNearRe
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNodeRestartTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOptimisticTxNodeRestartTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheMultithreadedUpdateTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNodeRestartSelfTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -31,13 +32,9 @@ import org.junit.runners.Suite;
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
- GridCachePartitionedNodeRestartTest.class,
GridCachePartitionedOptimisticTxNodeRestartTest.class,
- GridCacheReplicatedNodeRestartSelfTest.class,
+ NearCacheMultithreadedUpdateTest.class,
GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest.class,
- IgniteCacheNearRestartRollbackSelfTest.class,
-
- IgniteCacheCreateRestartSelfTest.class
})
public class IgniteCacheRestartTestSuite {
}