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 2018/07/24 07:28:10 UTC
[2/2] ignite git commit: ignite-6467
ignite-6467
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b01f11bc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b01f11bc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b01f11bc
Branch: refs/heads/ignite-6467
Commit: b01f11bc3ea1e0f1bf9707c9bc7ce8cf28afb201
Parents: 625af1b
Author: sboikov <sb...@apache.org>
Authored: Tue Jul 24 10:28:00 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Tue Jul 24 10:28:00 2018 +0300
----------------------------------------------------------------------
.../processors/cache/distributed/CacheExchangeMergeTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b01f11bc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
index 8d07fa0..dbf95f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
@@ -443,7 +443,7 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest {
if (cache.getConfiguration(CacheConfiguration.class).getAtomicityMode() == TRANSACTIONAL) {
for (TransactionConcurrency concurrency : TransactionConcurrency.values()) {
for (TransactionIsolation isolation : TransactionIsolation.values())
- checkNodeCaches(err, node, cache, TransactionConcurrency.OPTIMISTIC, TransactionIsolation.SERIALIZABLE);
+ checkNodeCaches(err, node, cache, TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ);
}
}
}
@@ -492,7 +492,7 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest {
// No-op.
ignore.printStackTrace();
- System.exit(2);
+ return;
}
for (Map.Entry<Object, Object> e : map.entrySet()) {