You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by gv...@apache.org on 2019/02/14 12:48:39 UTC
[ignite] branch master updated: IGNITE-11247: MVCC TX: Unmute
tests. This closes #6056.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new edd3ceb IGNITE-11247: MVCC TX: Unmute tests. This closes #6056.
edd3ceb is described below
commit edd3cebe81c3d9a1552184f3d7469be3074c16e4
Author: Andrey V. Mashenkov <an...@gmail.com>
AuthorDate: Thu Feb 14 15:48:29 2019 +0300
IGNITE-11247: MVCC TX: Unmute tests. This closes #6056.
---
.../org/apache/ignite/failure/IoomFailureHandlerTest.java | 13 ++++++++-----
.../mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java | 1 +
.../CacheMvccPartitionedSqlCoordinatorFailoverTest.java | 10 ----------
.../mvcc/CacheMvccReplicatedSqlCoordinatorFailoverTest.java | 9 ---------
4 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java
index c6eb88c..9f95f41 100644
--- a/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.mem.IgniteOutOfMemoryException;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.transactions.Transaction;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -122,7 +121,6 @@ public class IoomFailureHandlerTest extends AbstractFailureHandlerTest {
/**
* Test IgniteOutOfMemoryException handling with PDS.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-10185")
@Test
public void testIoomErrorMvccPdsHandling() throws Exception {
testIoomErrorHandling(true, true);
@@ -131,7 +129,7 @@ public class IoomFailureHandlerTest extends AbstractFailureHandlerTest {
/**
* Test IOOME handling.
*/
- public void testIoomErrorHandling(boolean pds, boolean mvcc) throws Exception {
+ private void testIoomErrorHandling(boolean pds, boolean mvcc) throws Exception {
this.pds = pds;
this.mvcc = mvcc;
@@ -158,8 +156,13 @@ public class IoomFailureHandlerTest extends AbstractFailureHandlerTest {
}
assertFalse(dummyFailureHandler(ignite0).failure());
- assertTrue(dummyFailureHandler(ignite1).failure());
- assertTrue(X.hasCause(dummyFailureHandler(ignite1).failureContext().error(), IgniteOutOfMemoryException.class));
+
+ if (mvcc && pds)
+ assertFalse(dummyFailureHandler(ignite1).failure());
+ else {
+ assertTrue(dummyFailureHandler(ignite1).failure());
+ assertTrue(X.hasCause(dummyFailureHandler(ignite1).failureContext().error(), IgniteOutOfMemoryException.class));
+ }
}
finally {
stopGrid(1);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java
index 6ad2ea5..cead2c6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java
@@ -61,6 +61,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM
/**
* @throws Exception If failed.
*/
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-11311")
@Test
public void testAccountsTxSql_SingleNode_CoordinatorFails_Persistence() throws Exception {
persistence = true;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedSqlCoordinatorFailoverTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedSqlCoordinatorFailoverTest.java
index 30a2834..866f022 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedSqlCoordinatorFailoverTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedSqlCoordinatorFailoverTest.java
@@ -138,7 +138,6 @@ public class CacheMvccPartitionedSqlCoordinatorFailoverTest extends CacheMvccAbs
/**
* @throws Exception If failed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-10752")
@Test
public void testPutAllGetAll_ClientServer_Backups1_SinglePartition_RestartRandomSrv_SqlDml() throws Exception {
putAllGetAll(RestartMode.RESTART_RND_SRV, 3, 1, 1, 1,
@@ -176,7 +175,6 @@ public class CacheMvccPartitionedSqlCoordinatorFailoverTest extends CacheMvccAbs
/**
* @throws Exception If failed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-8841")
@Test
public void testSqlReadInsideTxInProgressCoordinatorFails() throws Exception {
readInProgressCoordinatorFails(false, true, PESSIMISTIC, REPEATABLE_READ, SQL, DML, new InitIndexing(Integer.class, Integer.class));
@@ -193,7 +191,6 @@ public class CacheMvccPartitionedSqlCoordinatorFailoverTest extends CacheMvccAbs
/**
* @throws Exception If failed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-8841")
@Test
public void testSqlReadInsideTxInProgressCoordinatorFails_ReadDelay() throws Exception {
readInProgressCoordinatorFails(true, true, PESSIMISTIC, REPEATABLE_READ, SQL, DML, new InitIndexing(Integer.class, Integer.class));
@@ -206,11 +203,4 @@ public class CacheMvccPartitionedSqlCoordinatorFailoverTest extends CacheMvccAbs
public void testReadInProgressCoordinatorFailsSimple_FromServer() throws Exception {
readInProgressCoordinatorFailsSimple(false, new InitIndexing(Integer.class, Integer.class), SQL, DML);
}
-
- /** {@inheritDoc} */
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-10753")
- @Test
- @Override public void testAccountsTxSql_SingleNode_CoordinatorFails_Persistence() throws Exception {
- super.testAccountsTxSql_SingleNode_CoordinatorFails_Persistence();
- }
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSqlCoordinatorFailoverTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSqlCoordinatorFailoverTest.java
index a6d8558..2f72bce 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSqlCoordinatorFailoverTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSqlCoordinatorFailoverTest.java
@@ -18,8 +18,6 @@
package org.apache.ignite.internal.processors.cache.mvcc;
import org.apache.ignite.cache.CacheMode;
-import org.junit.Ignore;
-import org.junit.Test;
/**
* SQL Mvcc coordinator failover test for replicated caches.
@@ -29,11 +27,4 @@ public class CacheMvccReplicatedSqlCoordinatorFailoverTest extends CacheMvccAbst
@Override protected CacheMode cacheMode() {
return CacheMode.REPLICATED;
}
-
- /** {@inheritDoc} */
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-10753")
- @Test
- @Override public void testAccountsTxSql_SingleNode_CoordinatorFails_Persistence() throws Exception {
- super.testAccountsTxSql_SingleNode_CoordinatorFails_Persistence();
- }
}