IGNITE-9884 Tests should be muted correctly (unmuted passing tests) - Fixes #5055.
Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b873c456 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b873c456 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b873c456 Branch: refs/heads/ignite-627 Commit: b873c4563029394ba341da2c0ea442cb8a473fd0 Parents: e111d89 Author: Oleg Ignatenko <oignate...@gridgain.com> Authored: Sat Oct 27 17:23:16 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Sat Oct 27 17:28:15 2018 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 14 +++----- ...ridCacheStoreManagerDeserializationTest.java | 4 +-- .../IgniteCacheConfigVariationsFullApiTest.java | 4 +-- .../cache/mvcc/CacheMvccTransactionsTest.java | 6 ++-- .../pagemem/PageIdDistributionTest.java | 4 +-- .../continuous/GridEventConsumeSelfTest.java | 2 +- .../processors/database/BPlusTreeSelfTest.java | 34 -------------------- ...GridServiceProcessorBatchDeploySelfTest.java | 22 ++++++------- ...gniteClientReconnectMassiveShutdownTest.java | 4 +-- .../tcp/TcpDiscoveryMultiThreadedTest.java | 4 ++- 10 files changed, 26 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 371ca9f..5f4f349 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -273,20 +273,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * Checks that any invoke returns result. * * @throws Exception if something goes bad. - * - * TODO https://issues.apache.org/jira/browse/IGNITE-4380. */ - public void _testInvokeAllMultithreaded() throws Exception { + public void testInvokeAllMultithreaded() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-4380";); + final IgniteCache<String, Integer> cache = jcache(); final int threadCnt = 4; final int cnt = 5000; - // Concurrent invoke can not be used for ATOMIC cache in CLOCK mode. - if (atomicityMode() == ATOMIC && - cacheMode() != LOCAL && - false) - return; - final Set<String> keys = Collections.singleton("myKey"); GridTestUtils.runMultiThreaded(new Runnable() { @@ -5031,7 +5025,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract // If AssertionFailedError is in the chain, assume we need to wait and retry. if (!X.hasCause(t, AssertionFailedError.class)) throw t; - + if (i == 9) { for (int j = 0; j < gridCount(); j++) executeOnLocalOrRemoteJvm(j, new PrintIteratorStateTask()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java index a1623d2..1332d36 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java @@ -203,13 +203,11 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract } /** - * TODO GG-11148. - * * Check whether binary objects are stored without unmarshalling via stream API. * * @throws Exception If failed. */ - public void _testBinaryStream() throws Exception { + public void testBinaryStream() throws Exception { final Ignite grid = startGrid("binaryGrid"); final IgniteCache<BinaryObject, BinaryObject> cache = grid.createCache(CACHE_NAME).withKeepBinary(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java index e2b1a2e..6422463 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java @@ -3203,11 +3203,9 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar } /** - * TODO: GG-11241. - * * @throws Exception If failed. */ - public void _testDeletedEntriesFlag() throws Exception { + public void testDeletedEntriesFlag() throws Exception { if (cacheMode() != LOCAL && cacheMode() != REPLICATED) { final int cnt = 3; http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java index ca3c09f..b9bbfcf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java @@ -2064,11 +2064,11 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { } /** - * TODO IGNITE-5935 enable when recovery is implemented. - * * @throws Exception If failed. */ - public void _testNodesRestartNoHang() throws Exception { + public void testNodesRestartNoHang() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-5935";); + final int srvs = 4; final int clients = 4; final int writers = 6; http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java index 2008b22..1f4b94f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java @@ -140,7 +140,7 @@ public class PageIdDistributionTest extends GridCommonAbstractTest { } /** - * Uncomment and run this test manually to get data to plot histogram for per-element distance from ideal. + * If needed run this test manually to get data to plot histogram for per-element distance from ideal. * You can use Octave to plot the histogram: * <pre> * all = csvread("histo.txt"); @@ -149,7 +149,7 @@ public class PageIdDistributionTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ - public void _testRealHistory() throws Exception { + public void testRealHistory() throws Exception { int capacity = CACHE_IDS.length * PARTS * PAGES; info("Capacity: " + capacity); http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index 1a7abd4..d2d895e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -1145,7 +1145,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testMultithreadedWithNodeRestart() throws Exception { + public void testMultithreadedWithNodeRestart() throws Exception { final AtomicBoolean stop = new AtomicBoolean(); final BlockingQueue<IgniteBiTuple<Integer, UUID>> queue = new LinkedBlockingQueue<>(); final Collection<UUID> started = new GridConcurrentHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java index 6b694c9..fa72978 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java @@ -299,40 +299,6 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest { } /** - * @throws IgniteCheckedException If failed. - */ - public void _testBenchInvoke() throws IgniteCheckedException { - MAX_PER_PAGE = 10; - - TestTree tree = createTestTree(true); - - long start = System.nanoTime(); - - for (int i = 0; i < 10_000_000; i++) { - final long key = BPlusTree.randomInt(1000); - -// tree.findOne(key); // 39 -// tree.putx(key); // 22 - - tree.invoke(key, null, new IgniteTree.InvokeClosure<Long>() { // 25 - @Override public void call(@Nullable Long row) throws IgniteCheckedException { - // No-op. - } - - @Override public Long newRow() { - return key; - } - - @Override public IgniteTree.OperationType operationType() { - return PUT; - } - }); - } - - X.println(" __ time: " + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)); - } - - /** * @param cursor cursor to check. * @param iterator iterator with expected result. * @throws IgniteCheckedException If failed http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java index f0e2e71..c461ce2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java @@ -129,11 +129,9 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT } /** - * TODO: enable when IGNITE-6259 is fixed. - * * @throws Exception If failed. */ - public void _testDeployAllTopologyChange() throws Exception { + public void testDeployAllTopologyChange() throws Exception { Ignite client = grid(CLIENT_NODE_NAME); final AtomicBoolean finished = new AtomicBoolean(); @@ -141,7 +139,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT IgniteInternalFuture<Object> topChangeFut = runTopChanger(finished); try { - int numServices = 500; + int numServices = 50; int batchSize = 5; CountDownLatch latch = new CountDownLatch(numServices); @@ -171,7 +169,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT from = to; } - assertTrue(latch.await(30, TimeUnit.SECONDS)); + assertTrue(latch.await(120, TimeUnit.SECONDS)); assertDeployedServices(client, cfgs); } @@ -183,11 +181,9 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT } /** - * TODO: enable when IGNITE-6259 is fixed. - * * @throws Exception If failed. */ - public void _testDeployAllTopologyChangeFail() throws Exception { + public void testDeployAllTopologyChangeFail() throws Exception { final Ignite client = grid(CLIENT_NODE_NAME); final AtomicBoolean finished = new AtomicBoolean(); @@ -195,7 +191,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT IgniteInternalFuture<Object> topChangeFut = runTopChanger(finished); try { - int numServices = 500; + int numServices = 200; int batchSize = 5; CountDownLatch latch = new CountDownLatch(numServices); @@ -248,7 +244,7 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT from = to; } - assertTrue(latch.await(30, TimeUnit.SECONDS)); + assertTrue(latch.await(120, TimeUnit.SECONDS)); cfgs.removeAll(failingCfgs); @@ -436,11 +432,11 @@ public class GridServiceProcessorBatchDeploySelfTest extends GridCommonAbstractT } /** - * TODO: enable when IGNITE-6259 is fixed. - * * @throws Exception If failed. */ - public void _testCancelAllTopologyChange() throws Exception { + public void testCancelAllTopologyChange() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-10021";); + Ignite client = grid(CLIENT_NODE_NAME); int numServices = 500; http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java index 2878110..6bd2a45 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java @@ -95,7 +95,7 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract /** * @throws Exception If any error occurs. */ - public void _testMassiveServersShutdown1() throws Exception { + public void testMassiveServersShutdown1() throws Exception { massiveServersShutdown(StopType.FAIL_EVENT); } @@ -109,7 +109,7 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract /** * @throws Exception If any error occurs. */ - public void _testMassiveServersShutdown3() throws Exception { + public void testMassiveServersShutdown3() throws Exception { massiveServersShutdown(StopType.CLOSE); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b873c456/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index 70d5078..06021d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -228,7 +228,9 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { /** * @throws Exception If any error occurs. */ - public void _testMultiThreadedServersRestart() throws Throwable { + public void testMultiThreadedServersRestart() throws Throwable { + fail("https://issues.apache.org/jira/browse/IGNITE-1123";); + multiThreadedClientsServersRestart(GRID_CNT * 2, 0); }
