You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2019/03/18 12:16:32 UTC
[ignite] branch master updated: IGNITE-10769: Fix flacky test
IgniteCacheContinuousQueryClientTest.testNodeJoinsRestartQuery. This closes
#5858.
This is an automated email from the ASF dual-hosted git repository.
amashenkov 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 1d42b17 IGNITE-10769: Fix flacky test IgniteCacheContinuousQueryClientTest.testNodeJoinsRestartQuery. This closes #5858.
1d42b17 is described below
commit 1d42b17f7c31c09f4e6b2b5c1a3f5225016034c5
Author: rkondakov <ko...@mail.ru>
AuthorDate: Mon Mar 18 15:16:21 2019 +0300
IGNITE-10769: Fix flacky test IgniteCacheContinuousQueryClientTest.testNodeJoinsRestartQuery. This closes #5858.
---
.../query/continuous/IgniteCacheContinuousQueryClientTest.java | 6 ++++++
.../cache/mvcc/CacheMvccContinuousQueryClientTest.java | 9 ---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
index 983cb32..4cad1b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java
@@ -109,6 +109,8 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
Ignite joined1 = startGrid(4);
+ awaitPartitionMapExchange();
+
IgniteCache<Object, Object> joinedCache1 = joined1.cache(DEFAULT_CACHE_NAME);
joinedCache1.put(primaryKey(joinedCache1), 1);
@@ -119,6 +121,8 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
Ignite joined2 = startGrid(5);
+ awaitPartitionMapExchange();
+
IgniteCache<Object, Object> joinedCache2 = joined2.cache(DEFAULT_CACHE_NAME);
joinedCache2.put(primaryKey(joinedCache2), 2);
@@ -163,6 +167,8 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest
Ignite joined1 = startGrid(4);
+ awaitPartitionMapExchange();
+
IgniteCache<Object, Object> joinedCache1 = joined1.cache(DEFAULT_CACHE_NAME);
joinedCache1.put(primaryKey(joinedCache1), 1);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousQueryClientTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousQueryClientTest.java
index 2148877..5c6c7a8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousQueryClientTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousQueryClientTest.java
@@ -18,8 +18,6 @@ package org.apache.ignite.internal.processors.cache.mvcc;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientTest;
-import org.junit.Ignore;
-import org.junit.Test;
/**
* Mvcc CQ client test.
@@ -29,11 +27,4 @@ public class CacheMvccContinuousQueryClientTest extends IgniteCacheContinuousQue
@Override protected CacheAtomicityMode atomicityMode() {
return CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
}
-
- /** {@inheritDoc} */
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-10769")
- @Test
- @Override public void testNodeJoinsRestartQuery() throws Exception {
- super.testNodeJoinsRestartQuery();
- }
}