Repository: incubator-geode Updated Branches: refs/heads/develop 46b95d4c5 -> 3626c75f8
Add more tests to flaky category based on recent CI failures Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3626c75f Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3626c75f Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3626c75f Branch: refs/heads/develop Commit: 3626c75f85117a7b10f6968e827461d18f8dbc31 Parents: 46b95d4 Author: Anthony Baker <[email protected]> Authored: Mon Oct 10 11:52:38 2016 -0700 Committer: Anthony Baker <[email protected]> Committed: Mon Oct 10 15:21:48 2016 -0700 ---------------------------------------------------------------------- .../internal/cache/execute/FunctionServiceBase.java | 1 + .../geode/internal/cache/ha/Bug48571DUnitTest.java | 13 +++++++++++-- .../cache/tier/sockets/HAInterestPart2DUnitTest.java | 3 ++- .../geode/management/ClientHealthStatsDUnitTest.java | 2 ++ .../internal/cli/commands/QueueCommandsDUnitTest.java | 1 + .../SharedConfigurationUsingDirDUnitTest.java | 1 + .../geode/security/SecurityClusterConfigDUnitTest.java | 5 ++++- .../ConcurrentParallelGatewaySenderDUnitTest.java | 1 + .../ConcurrentWANPropagation_1_DUnitTest.java | 3 ++- 9 files changed, 25 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java index 5cd1327..030ec60 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java @@ -235,6 +235,7 @@ public abstract class FunctionServiceBase extends JUnit4CacheTestCase { Assert.assertEquals(0, customCollector.getResult().size()); } + @Category(FlakyTest.class) // GEODE-1981 @Test public void customCollectorReturnsResultOfSendException() { ResultCollector rc = getExecution().withCollector(customCollector).execute((context) -> { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java index 4bc7ecb..d3a407f 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java @@ -16,8 +16,15 @@ */ package org.apache.geode.internal.cache.ha; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID; +import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE; +import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED; +import static org.junit.Assert.assertEquals; import java.util.Collection; import java.util.Iterator; @@ -50,6 +57,7 @@ import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; @Category(DistributedTest.class) public class Bug48571DUnitTest extends JUnit4DistributedTestCase { @@ -114,6 +122,7 @@ public class Bug48571DUnitTest extends JUnit4DistributedTestCase { Wait.waitForCriterion(criterion, 15 * 1000, 200, true); } + @Category(FlakyTest.class) // GEODE-510 @Test public void testStatsMatchWithSize() throws Exception { IgnoredException.addIgnoredException("Unexpected IOException||Connection reset"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java index 3fb15b5..409fbf4 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.*; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; - +import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.cache.EntryDestroyedException; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ServerConnectivityException; @@ -332,6 +332,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { * Tests if failure occurred in Interest recovery thread, then it should select * new endpoint to register interest */ + @Category(FlakyTest.class) // GEODE-108 @Test public void testInterestRecoveryFailure() throws Exception { IgnoredException.addIgnoredException("Server unreachable"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java index a62bb06..74e0850 100644 --- a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java @@ -48,6 +48,7 @@ import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; /** * Client health stats check @@ -174,6 +175,7 @@ public class ClientHealthStatsDUnitTest extends JUnit4DistributedTestCase { helper.stopManagingNode(managingNode); } + @Category(FlakyTest.class) // GEODE-337 @Test public void testStatsMatchWithSize() throws Exception { // start a server http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java index 3a6a31a..ca0bdba 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java @@ -246,6 +246,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { /** * Asserts that creating async event queues correctly updates the shared configuration. */ + @Category(FlakyTest.class) // GEODE-1976 @Test public void testCreateUpdatesSharedConfig() throws IOException { disconnectAllFromDS(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java index 0683965..0e7ab55 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java @@ -89,6 +89,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase { } } + @Category(FlakyTest.class) // GEODE-1979 @Test public void basicClusterConfigDirWithTwoLocators() throws Exception { final int[] ports = getRandomAvailableTCPPorts(2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java index 395d73e..ff7f028 100644 --- a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java @@ -42,6 +42,7 @@ import org.apache.geode.test.dunit.IgnoredException; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.categories.SecurityTest; @Category({ DistributedTest.class, SecurityTest.class }) @@ -80,6 +81,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase { IgnoredException.removeAllExpectedExceptions(); } + @Category(FlakyTest.class) // GEODE-1977 @Test public void testStartServerWithClusterConfig() throws Exception { // set up server with security @@ -134,6 +136,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase { assertTrue(secProps.containsKey("security-post-processor")); } + @Category(FlakyTest.class) // GEODE-1975 @Test public void serverWithDifferentSecurityManagerShouldThrowException() { // set up server with security @@ -183,7 +186,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase { } - + @Category(FlakyTest.class) // GEODE-1974 @Test public void serverConnectingToSecuredLocatorMustUseClusterConfig() { // set up server with security http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java index 3451b51..e06e564 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java @@ -586,6 +586,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { getTestMethodName(), 1000 )); } + @Category(FlakyTest.class) // GEODE-1586 @Test public void testPartitionedParallelPropagationHA() throws Exception { IgnoredException.addIgnoredException(SocketException.class.getName()); // for Connection reset http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3626c75f/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java index e246139..8bfd8e7 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.*; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; - +import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.cache.CacheException; import org.apache.geode.cache.EntryExistsException; import org.apache.geode.cache.client.ServerOperationException; @@ -319,6 +319,7 @@ public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase { * * @throws Exception */ + @Category(FlakyTest.class) // GEODE-1978 @Test public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception { Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
