This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 790c967 GEODE-5371: Remove many FlakyTest categorizations. (#2123)
790c967 is described below
commit 790c967f014d455330aba9bfb5c8909ddae3ebd7
Author: Patrick Rhomberg <[email protected]>
AuthorDate: Mon Jul 16 10:17:35 2018 -0700
GEODE-5371: Remove many FlakyTest categorizations. (#2123)
* Tests whose annotation was removed had at most 1 failure (and most had
zero) over 1,500+ runs.
* Rename RedisServerTest -> RedisServerIntegrationTest, use random
available port rather than default to avoid failure due to bad environment
---
.../SessionReplicationIntegrationJUnitTest.java | 14 --
.../LauncherLifecycleCommandsDUnitTest.java | 3 +-
...RestAPIsOnGroupsFunctionExecutionDUnitTest.java | 2 -
.../management/internal/cli/util/MergeLogs.java | 1 -
.../org/apache/geode/redis/GeodeRedisServer.java | 8 +-
.../geode/cache/ConnectionPoolDUnitTest.java | 2 -
.../org/apache/geode/cache/ProxyJUnitTest.java | 22 ---
.../management/MemoryThresholdsDUnitTest.java | 4 -
.../MemoryThresholdsOffHeapDUnitTest.java | 6 -
.../cache/management/ResourceManagerDUnitTest.java | 8 -
.../cache/query/dunit/CompiledInDUnitTest.java | 3 -
.../dunit/QueryDataInconsistencyDUnitTest.java | 2 -
.../dunit/QueryUsingFunctionContextDUnitTest.java | 3 -
.../cache/query/dunit/RemoteQueryDUnitTest.java | 2 -
.../QueryREUpdateInProgressJUnitTest.java | 6 +-
...ntIndexOperationsOnOverflowRegionDUnitTest.java | 2 -
...exUpdateWithInplaceObjectModFalseDUnitTest.java | 3 -
.../partitioned/PRColocatedEquiJoinDUnitTest.java | 2 -
...DistributedAckPersistentRegionCCEDUnitTest.java | 128 ------------
...utedAckPersistentRegionCCEOffHeapDUnitTest.java | 9 -
.../cache30/DistributedAckRegionCCEDUnitTest.java | 2 +
.../DistributedNoAckRegionCCEDUnitTest.java | 215 ---------------------
.../geode/cache30/MultiVMRegionTestCase.java | 8 -
.../geode/cache30/PartitionedRegionDUnitTest.java | 2 -
.../geode/cache30/RegionReliabilityTestCase.java | 4 -
.../geode/cache30/TXDistributedDUnitTest.java | 2 -
.../LocatorLauncherRemoteIntegrationTest.java | 2 -
.../geode/distributed/SystemAdminDUnitTest.java | 2 -
...lusterDistributionManagerForAdminDUnitTest.java | 2 -
.../internal/ProductUseLogDUnitTest.java | 2 -
...edThreadPoolExecutorWithKeepAliveJUnitTest.java | 2 -
.../cache/ClientServerTransactionDUnitTest.java | 3 -
...precatedCacheServerLauncherIntegrationTest.java | 2 -
.../cache/DiskRegionAsyncRecoveryJUnitTest.java | 2 -
.../geode/internal/cache/GIIDeltaDUnitTest.java | 9 -
.../PartitionedRegionDelayedRecoveryDUnitTest.java | 7 -
.../cache/PartitionedRegionSingleHopDUnitTest.java | 4 -
.../cache/eviction/EvictionStatsDUnitTest.java | 2 -
.../cache/eviction/OffHeapEvictionDUnitTest.java | 2 -
...istributedRegionFunctionExecutionDUnitTest.java | 2 -
...ientServerRegionFunctionExecutionDUnitTest.java | 2 -
...erRegionFunctionExecutionFailoverDUnitTest.java | 2 -
...egionFunctionExecutionNoSingleHopDUnitTest.java | 3 -
...ctionExecutionSelectorNoSingleHopDUnitTest.java | 2 -
.../internal/cache/ha/HARegionQueueDUnitTest.java | 3 -
...sistentColocatedPartitionedRegionDUnitTest.java | 4 -
...PersistentPartitionedRegionDistributedTest.java | 2 +-
.../fixed/FixedPartitioningDUnitTest.java | 3 +-
.../sockets/DestroyEntryPropagationDUnitTest.java | 3 -
.../tier/sockets/DurableRegistrationDUnitTest.java | 2 -
.../tier/sockets/HAInterestPart2DUnitTest.java | 2 -
.../sockets/HAStartupAndFailoverDUnitTest.java | 2 -
.../cache/tier/sockets/RegionCloseDUnitTest.java | 2 -
.../tier/sockets/ReliableMessagingDUnitTest.java | 2 -
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 2 +-
.../BaseProcessStreamReaderIntegrationTest.java | 3 -
.../FileProcessControllerIntegrationTest.java | 2 -
.../GemFireStatSamplerIntegrationTest.java | 2 -
.../management/MemberMBeanAttributesDUnitTest.java | 2 -
.../management/RegionCreateDestroyDUnitTest.java | 3 -
.../CreateAlterDestroyRegionCommandsDUnitTest.java | 4 +-
.../cli/commands/GemfireDataCommandsDUnitTest.java | 10 +-
...urationPersistenceServiceUsingDirDUnitTest.java | 3 +-
.../internal/pulse/TestFunctionsDUnitTest.java | 4 -
.../memcached/GemcachedDevelopmentJUnitTest.java | 2 -
.../org/apache/geode/redis/HashesJUnitTest.java | 3 -
...erTest.java => RedisServerIntegrationTest.java} | 26 +--
.../apache/geode/security/ClientAuthDUnitTest.java | 4 +-
.../security/ClientAuthenticationDUnitTest.java | 3 -
.../DeltaClientPostAuthorizationDUnitTest.java | 2 -
.../geode/security/P2PAuthenticationDUnitTest.java | 3 -
.../SecurityManagerLifecycleIntegrationTest.java | 2 -
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 3 -
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 2 -
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 3 -
.../geode/internal/cache/PutAllCSDUnitTest.java | 2 -
.../tier/sockets/DurableClientSimpleDUnitTest.java | 4 -
.../commands/DurableClientCommandsDUnitTest.java | 3 +-
.../security/ClientAuthzObjectModDUnitTest.java | 2 -
.../security/ClientPostAuthorizationDUnitTest.java | 5 +-
.../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 3 +-
...ANPersistenceEnabledGatewaySenderDUnitTest.java | 3 +-
.../parallel/ParallelWANPropagationDUnitTest.java | 5 +-
.../wan/parallel/ParallelWANStatsDUnitTest.java | 3 +-
.../wan/serial/SerialWANPropagationDUnitTest.java | 3 +-
.../geode/management/WANManagementDUnitTest.java | 5 +-
86 files changed, 37 insertions(+), 629 deletions(-)
diff --git
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
index 47c439a..48b7e3d 100644
---
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
+++
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.modules.session.filter.SessionCachingFilter;
import org.apache.geode.modules.session.junit.PerTestClassLoaderRunner;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SessionTest;
@@ -312,9 +311,6 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test setting an attribute to null deletes it
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
vars with class
- // loader isolation, TODO: rewrite test with
JUnit 4 rules including
- // TemporaryFolder
@Test
public void testSetAttributeNullDeletesIt() throws Exception {
Callback c_1 = (request, response) ->
request.getSession().setAttribute("foo", "bar");
@@ -397,9 +393,6 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that invalidating a session destroys it as well as the backend
object.
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
vars with class
- // loader isolation, TODO: rewrite test with
JUnit 4 rules including
- // TemporaryFolder
@Test
public void testInvalidateSession1() throws Exception {
Callback c_1 = (request, response) ->
request.getSession().setAttribute("foo", "bar");
@@ -469,9 +462,6 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that invalidating a session throws an exception on subsequent access.
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
vars with class
- // loader isolation, TODO: rewrite test with
JUnit 4 rules including
- // TemporaryFolder
@Test
public void testInvalidateSession3() throws Exception {
Callback c_1 = (request, response) -> {
@@ -658,7 +648,6 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that invalidating a session throws an exception on subsequent access.
*/
- @Category(FlakyTest.class) // GEODE-1943
@Test
public void testInvalidateSession9() throws Exception {
Callback c_1 = (request, response) -> {
@@ -966,9 +955,6 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that request forward dispatching works
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static
vars with class
- // loader isolation, TODO: rewrite test with
JUnit 4 rules including
- // TemporaryFolder
@Test
public void testDispatchingForward1() throws Exception {
Callback c_1 = (request, response) -> {
diff --git
a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index d5277b8..bd7f131 100644
---
a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++
b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -104,7 +104,7 @@ import org.apache.geode.test.junit.rules.RequiresGeodeHome;
* @see org.apache.geode.management.internal.cli.util.CommandStringBuilder
* @since GemFire 7.0
*/
-@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530
+@Category(DistributedTest.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings("serial")
public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
@@ -967,6 +967,7 @@ public class LauncherLifecycleCommandsDUnitTest extends
CliCommandTestBase {
}
@Test
+ @Category(FlakyTest.class) // GEODE-1866
public void test014GemFireServerJvmProcessTerminatesOnOutOfMemoryError()
throws Exception {
int ports[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
final int serverPort = ports[0];
diff --git
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index 85971fa..8150562 100644
---
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -33,7 +33,6 @@ import
org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -82,7 +81,6 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest
extends RestAPITestBase
restURLs.clear();
}
- @Category(FlakyTest.class) // GEODE-1924
@Test
public void testonGroupsExecutionOnAllMembersWithFilter() {
setupCacheWithGroupsAndFunction();
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java
index 67446e3..496d6ed 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MergeLogs.java
@@ -38,7 +38,6 @@ import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
/**
- *
* @since GemFire 7.0
*/
diff --git
a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
index 309f3c1..1df0528 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
@@ -332,15 +332,11 @@ public class GeodeRedisServer {
* @param logLevel The logging level to be used by GemFire
*/
public GeodeRedisServer(String bindAddress, int port, String logLevel) {
- if (port <= 0)
- this.serverPort = DEFAULT_REDIS_SERVER_PORT;
- else
- this.serverPort = port;
+ this.serverPort = port <= 0 ? DEFAULT_REDIS_SERVER_PORT : port;
this.bindAddress = bindAddress;
this.logLevel = logLevel;
this.numWorkerThreads = setNumWorkerThreads();
- if (this.numWorkerThreads == 0)
- this.singleThreadPerConnection = true;
+ this.singleThreadPerConnection = this.numWorkerThreads == 0;
this.numSelectorThreads = 1;
this.metaListener = new MetaCacheListener();
this.expirationFutures = new ConcurrentHashMap<ByteArrayWrapper,
ScheduledFuture<?>>();
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
index 189de8a..55a3a4c 100755
---
a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
@@ -78,7 +78,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This class tests the client connection pool in GemFire. It does so by
creating a cache server
@@ -5727,7 +5726,6 @@ public class ConnectionPoolDUnitTest extends
JUnit4CacheTestCase {
* Now confirm that a tx done in a peer of a server (the server having an
empty region and wanting
* all events) sends the tx to its clients
*/
- @Category(FlakyTest.class) // GEODE-1717
@Test
public void test038Bug39526part2() throws CacheException,
InterruptedException {
disconnectAllFromDS();
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
index f7cbf9b..dc19ed4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
@@ -1034,19 +1033,6 @@ public class ProxyJUnitTest {
};
af.addCacheListener(cl1);
- // // first make sure this test is valid by confirming we see evictions
- // // on a non-proxy lru
- // {
- // af.setDataPolicy(DataPolicy.NORMAL);
- // Region r = this.c.createRegion("rLRU", af.create());
- // clearCallbackState();
- // assertTrue(clInvokeCount == 0);
- // for (int i=0; i < 10; i++) {
- // r.put("key" + i, "value" + i);
- // }
- // assertTrue(clInvokeCount > 0);
- // }
-
// now try it with a proxy region which should never to do an eviction.
{
af.setDataPolicy(DataPolicy.EMPTY);
@@ -1055,20 +1041,12 @@ public class ProxyJUnitTest {
fail("expected IllegalStateException");
} catch (IllegalStateException expected) {
}
- // Region r = this.c.createRegion("rEMPTY", af.create());
- // clearCallbackState();
- // assertTrue(clInvokeCount == 0);
- // for (int i=0; i < 10; i++) {
- // r.put("key" + i, "value" + i);
- // }
- // assertTrue(clInvokeCount == 0);
}
}
/**
* Make sure a proxy region expiration behaves as expected
*/
- @Category(FlakyTest.class) // GEODE-5094
@Test
public void testExpiration() throws Exception {
System.setProperty(LocalRegion.EXPIRY_MS_PROPERTY, "true");
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index d91a408..e02efe6 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -106,7 +106,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests the Heap Memory thresholds of {@link ResourceManager}
@@ -636,9 +635,6 @@ public class MemoryThresholdsDUnitTest extends
ClientServerTestCase {
prRemotePutRejection(true, false, true);
}
- @Category(FlakyTest.class) // GEODE-987: random ports, failed to throw
expected ResourceException,
- // overly complex expected exception handling,
memory and GC sensitive,
- // expiration, waitForCriterion
@Test
public void testPR_RemotePutRejectionWithTx() throws Exception {
prRemotePutRejection(false, false, true);
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index c4a5bd5..e8707cf 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -91,7 +91,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -517,8 +516,6 @@ public class MemoryThresholdsOffHeapDUnitTest extends
ClientServerTestCase {
* the local VM is in a critical state. Once the VM has moved to a safe
state then test that they
* are allowed.
*/
- @Category(FlakyTest.class) // GEODE-438: test pollution, async actions, time
sensitive,
- // waitForCriterion, TODO: consider disconnect DS
in setup
@Test
public void testDRLoadRejection() throws Exception {
final Host host = Host.getHost(0);
@@ -766,8 +763,6 @@ public class MemoryThresholdsOffHeapDUnitTest extends
ClientServerTestCase {
prRemotePutRejection(true, false, true);
}
- @Category(FlakyTest.class) // GEODE-500: time sensitive, memory sensitive
and GC dependent,
- // waitForCriterions
@Test
public void testPR_RemotePutRejectionWithTx() throws Exception {
prRemotePutRejection(false, false, true);
@@ -1352,7 +1347,6 @@ public class MemoryThresholdsOffHeapDUnitTest extends
ClientServerTestCase {
verifyProfiles(server3, 2);
}
- @Category(FlakyTest.class) // GEODE-1602
@Test
public void testPRClientPutRejection() throws Exception {
doClientServerTest("parRegReject", true/* createPR */);
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
index 29efa02..2f8e89f 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
@@ -72,7 +72,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests org.apache.geode.cache.control.ResourceManager.
@@ -883,8 +882,6 @@ public class ResourceManagerDUnitTest extends
JUnit4CacheTestCase {
});
}
- @Category(FlakyTest.class) // GEODE-755: thread unsafe test hook
(bucketReadHook), remove bucket
- // fails, possible product bug in rebalancing
@Test
public void testRemoveDuringGet() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
@@ -894,8 +891,6 @@ public class ResourceManagerDUnitTest extends
JUnit4CacheTestCase {
});
}
- @Category(FlakyTest.class) // GEODE-673: thread unsafe test hook
(bucketReadHook), remove bucket
- // fails, possible product bug in rebalancing
@Test
public void testRemoveDuringContainsKey() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
@@ -914,8 +909,6 @@ public class ResourceManagerDUnitTest extends
JUnit4CacheTestCase {
});
}
- @Category(FlakyTest.class) // GEODE-1768: thread unsafe test hook
(bucketReadHook), remove bucket
- // fails, possible product bug in rebalancing
@Test
public void testRemoveDuringKeySet() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
@@ -1058,7 +1051,6 @@ public class ResourceManagerDUnitTest extends
JUnit4CacheTestCase {
* Creates a chain of three colocated PRs and then calls removeBucket to
make sure that all
* colocated buckets are removed together.
*/
- @Category(FlakyTest.class) // GEODE-928: RemoveBucketMessage failure?
@Test
public void testRemoveColocatedBuckets() {
final String[] regionPath = new String[] {getUniqueName() + "-PR-0",
getUniqueName() + "-PR-1",
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
index 9aaa518..e08d18f 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
@Category({DistributedTest.class, OQLQueryTest.class})
@@ -142,7 +141,6 @@ public class CompiledInDUnitTest extends
JUnit4CacheTestCase {
}
- @Category(FlakyTest.class) // GEODE-1771
@Test
public void
whenMultipleEnumBindParametersAreUsedWithInQueryAndMapIndexIsPresentReturnCorrectResults()
throws CacheException {
@@ -472,7 +470,6 @@ public class CompiledInDUnitTest extends
JUnit4CacheTestCase {
bindArguments, "myIndex", "ts.getMapField[*]", regName + " ts"));
}
- @Category(FlakyTest.class) // GEODE-1765
@Test
public void
whenInSetCollectionContainsNonUniqueValuesMatchingSetShouldNotBeDuplicated()
throws CacheException {
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 12bb603..b5d847f 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
@@ -259,7 +258,6 @@ public class QueryDataInconsistencyDUnitTest implements
Serializable {
Awaitility.await().until(joinThread(putThread));
}
- @Category(FlakyTest.class) // GEODE-925: time sensitive, async actions,
short timeouts
@Test
public void testRangeIndexWithIndexAndQueryFromClauseMisMatch() {
// Create caches
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 4b8f8a5..995799a 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -69,7 +69,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -456,7 +455,6 @@ public class QueryUsingFunctionContextDUnitTest extends
JUnit4CacheTestCase {
}
- @Category(FlakyTest.class) // GEODE-575: ignores lots of exceptions,
non-thread-safe test hooks
@Test
public void testQueriesWithFilterKeysOnPRWithRebalancing() {
IgnoredException.addIgnoredException("QueryInvocationTargetException");
@@ -563,7 +561,6 @@ public class QueryUsingFunctionContextDUnitTest extends
JUnit4CacheTestCase {
}
- @Category(FlakyTest.class) // GEODE-1345
@Test
public void testJoinQueryPRWithMultipleIndexes() {
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
index 3c0eb70..e0e38ee 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -58,7 +58,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -912,7 +911,6 @@ public class RemoteQueryDUnitTest extends
JUnit4CacheTestCase {
/**
* Tests remote query execution using a BridgeClient as the CacheWriter and
CacheLoader.
*/
- @Category(FlakyTest.class) // GEODE-490: random port
@Test
public void testRemoteBridgeClientQueries() throws CacheException {
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
index d528a3b..c51f9aa 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
@@ -50,10 +49,7 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
*
*
*/
-@Category({IntegrationTest.class, FlakyTest.class, OQLIndexTest.class}) //
GEODE-1059: uses
- //
PRQueryHelper which
- //
launches
-// dunit vms in IntegrationTest
+@Category({IntegrationTest.class, OQLIndexTest.class})
public class QueryREUpdateInProgressJUnitTest {
private static final String exampleRegionName = "exampleRegion2";
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
index 2c8d598..8ed8705 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
@@ -50,7 +50,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
@@ -79,7 +78,6 @@ public class
ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4Ca
return properties;
}
- @Category(FlakyTest.class) // GEODE-1828
@Test
public void testAsyncIndexInitDuringEntryDestroyAndQueryOnRR() {
Host host = Host.getHost(0);
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index c648cab..55d6c21 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
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.OQLIndexTest;
/**
@@ -207,8 +206,6 @@ public class
ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest
};
}
- @Category(FlakyTest.class) // GEODE-431: time sensitive, uses
PRQueryDUnitHelper whcih eats
- // exceptions, async actions, uses Random
@Test
public void testRangeIndex() {
Host host = Host.getHost(0);
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 4a334de..3cbd1db 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -66,7 +66,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
@Category({DistributedTest.class, OQLQueryTest.class})
@@ -830,7 +829,6 @@ public class PRColocatedEquiJoinDUnitTest extends
CacheTestCase {
}
@Test
- @Category(FlakyTest.class) // GEODE-2022
public void testRRPRLocalQueryingWithHetroIndexes() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
index 0d57517..7a9e8f3 100644
---
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
@@ -66,132 +66,4 @@ public class DistributedAckPersistentRegionCCEDUnitTest
extends DistributedAckRe
};
return (VersionTag) vm.invoke(getVersionTag);
}
-
- // TODO: resurrect dead test or delete the following dead code
- // protected void do_version_recovery_if_necessary(final VM vm0, final VM
vm1, final VM vm2, final
- // Object[] params) {
- // final String name = (String)params[0];
- // final String hostName = (String)params[1];
- // final String key = (String)params[2];
- // final int ds1Port = (Integer)params[3];
- // final int hub0Port = (Integer)params[4];
- // final int hub2Port = (Integer)params[5];
- //
- // VersionTag tag0 = getVersionTag(vm0, key);
- // VersionTag tag1 = getVersionTag(vm1, key);
- // VersionTag tag2 = getVersionTag(vm2, key);
- //
- // // shutdown all the systems and restart to recover from disk
- // disconnect(vm0);
- // disconnect(vm1);
- // disconnect(vm2);
- //
- // createRegionWithGatewayHub(vm1, name, hostName, ds1Port, hub0Port,
hub2Port, true);
- // createRegionWithGatewayHub(vm0, name, hostName, ds1Port, hub0Port,
hub2Port, true);
- // createRegionWithGatewayHubAtOtherSide(vm2, name, hostName, hub0Port,
hub2Port, true);
- //
- // startHub(vm2);
- // startHub(vm0);
- //
- // VersionTag tag00 = getVersionTag(vm0, key);
- // VersionTag tag11 = getVersionTag(vm1, key);
- // VersionTag tag22 = getVersionTag(vm2, key);
- // assertTrue(tag00.equals(tag0));
- // assertTrue(tag11.equals(tag1));
- // assertTrue(tag22.equals(tag2));
- // }
- //
- // /**
- // * vm0 and vm1 are peers, each holds a DR.
- // * vm0 do 3 puts to change the version to be 3, wait for distributions to
vm1
- // * Shutdown and restart both of them.
- // * Make sure vm0 and vm1 are both at version 3.
- // * Do local clear at vm0. Then do a put. It will use version 1.
- // * This new operation should be rejected as conflicts at vm1.
- // * That means, recovered version 3 can reject the new operation at version
1.
- // */
- // public void testNewOperationConflictWithRecoveredVersion() throws
Throwable {
- // Host host = Host.getHost(0);
- // VM vm0 = host.getVM(0);
- // VM vm1 = host.getVM(1);
- // final String key = "Object2";
- //
- // SerializableRunnable disconnect = new SerializableRunnable("disconnect") {
- // public void run() {
- // GatewayBatchOp.VERSION_WITH_OLD_WAN = false;
- // distributedSystemID = -1;
- // CCRegion.getCache().getDistributedSystem().disconnect();
- // }
- // };
- //
- // final String name = this.getUniqueName() + "-CC";
- // SerializableRunnable createRegion = new SerializableRunnable("Create
Region") {
- // public void run() {
- // try {
- // RegionFactory f = getCache().createRegionFactory(getRegionAttributes());
- // CCRegion = (LocalRegion)f.create(name);
- // } catch (CacheException ex) {
- // fail("While creating region", ex);
- // }
- // }
- // };
- // vm0.invoke(createRegion);
- // vm1.invoke(createRegion);
- //
- // vm0.invoke(new SerializableRunnable("put several times to bump version to
3") {
- // public void run() {
- // CCRegion.put(key, "dummy"); // v1
- // CCRegion.put(key, "dummy"); // v2
- // CCRegion.put(key, "dummy"); // v3
- // }
- // });
- //
- // VersionTag tag0 = getVersionTag(vm0, key);
- // VersionTag tag1 = getVersionTag(vm1, key);
- // assertIndexDetailsEquals(3, tag0.getRegionVersion());
- // assertIndexDetailsEquals(3, tag0.getEntryVersion());
- // assertIndexDetailsEquals(3, tag1.getRegionVersion());
- // assertIndexDetailsEquals(3, tag1.getEntryVersion());
- //
- // // shutdown and recover
- // vm0.invoke(disconnect);
- // vm1.invoke(disconnect);
- // vm1.invoke(createRegion);
- // vm0.invoke(createRegion);
- //
- // tag0 = getVersionTag(vm0, key);
- // tag1 = getVersionTag(vm1, key);
- // assertIndexDetailsEquals(3, tag0.getRegionVersion());
- // assertIndexDetailsEquals(3, tag0.getEntryVersion());
- // assertIndexDetailsEquals(3, tag1.getRegionVersion());
- // assertIndexDetailsEquals(3, tag1.getEntryVersion());
- //
- // vm0.invoke(new SerializableRunnable("put with version 1, value vm1") {
- // public void run() {
- // // clear the region using a test hook so that a new version will be
- // // generated, starting at 1. This should be rejected by vm1 and not
- // // queued to the WAN by vm0
- // DistributedRegion.LOCALCLEAR_TESTHOOK = true;
- // try {
- // CCRegion.localClear();
- // } finally {
- // DistributedRegion.LOCALCLEAR_TESTHOOK = false;
- // }
- // CCRegion.put(key, "vm0");
- // Assert.assertIndexDetailsEquals("vm0", CCRegion.get(key));
- // }
- // });
- // vm1.invoke(new SerializableRunnable("verify that value has not been
updated") {
- // public void run() {
- // Assert.assertIndexDetailsEquals("dummy", CCRegion.get(key));
- // }
- // });
- //
- // tag0 = getVersionTag(vm0, key);
- // tag1 = getVersionTag(vm1, key);
- // assertIndexDetailsEquals(4, tag0.getRegionVersion());
- // assertIndexDetailsEquals(1, tag0.getEntryVersion());
- // assertIndexDetailsEquals(3, tag1.getRegionVersion());
- // assertIndexDetailsEquals(3, tag1.getEntryVersion());
- // }
}
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index 0308fe3..226453f 100755
---
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -18,7 +18,6 @@ import static
org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMO
import java.util.Properties;
-import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
@@ -27,7 +26,6 @@ import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
@@ -86,11 +84,4 @@ public class
DistributedAckPersistentRegionCCEOffHeapDUnitTest
}
return factory.create();
}
-
- @Category(FlakyTest.class) // GEODE-3451
- @Override
- @Test
- public void testConcurrentEventsOnEmptyRegion() {
- super.testConcurrentEventsOnEmptyRegion();
- }
}
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
index f7a6578..13d4edd 100644
---
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -66,6 +66,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
@Category({DistributedTest.class, OffHeapTest.class})
@@ -422,6 +423,7 @@ public class DistributedAckRegionCCEDUnitTest extends
DistributedAckRegionDUnitT
* and that the statistic is being updated properly
*/
@Test
+ @Category(FlakyTest.class) // GEODE-3451
public void testConcurrentEventsOnEmptyRegion() {
versionTestConcurrentEventsOnEmptyRegion();
}
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
index 05587c3..d67d8e1 100644
---
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class DistributedNoAckRegionCCEDUnitTest extends
DistributedNoAckRegionDUnitTest {
@@ -132,9 +131,6 @@ public class DistributedNoAckRegionCCEDUnitTest extends
DistributedNoAckRegionDU
waitForAsyncProcessing(vm1Ops, "");
waitForAsyncProcessing(vm2Ops, "");
- // if (a0failed && a1failed) {
- // fail("neither member saw event conflation - check stats for " + name);
- // }
Wait.pause(2000);// this test has with noack, thus we should wait before
validating entries
// check consistency of the regions
Map r0Contents = (Map) vm0.invoke(() -> this.getCCRegionContents());
@@ -278,14 +274,7 @@ public class DistributedNoAckRegionCCEDUnitTest extends
DistributedNoAckRegionDU
@Test
public void testTombstones() throws Exception {
- // for (int i=0; i<1000; i++) {
- // System.out.println("starting run #"+i);
versionTestTombstones();
- // if (i < 999) {
- // tearDown();
- // setUp();
- // }
- // }
}
@@ -370,7 +359,6 @@ public class DistributedNoAckRegionCCEDUnitTest extends
DistributedNoAckRegionDU
* This tests the concurrency versioning system to ensure that event
conflation happens correctly
* and that the statistic is being updated properly
*/
- @Category(FlakyTest.class) // GEODE-976: time sensitive, thread sleeps,
relies on stat values
@Test
public void testConcurrentEventsOnEmptyRegion() {
versionTestConcurrentEventsOnEmptyRegion();
@@ -390,207 +378,4 @@ public class DistributedNoAckRegionCCEDUnitTest extends
DistributedNoAckRegionDU
public void testGetAllWithVersions() {
versionTestGetAllWithVersions();
}
-
-
-
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- // these methods can be uncommented to inhibit test execution
- // when new tests are added
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- // @Override
- // public void testNonblockingGetInitialImage() throws Throwable {
- // }
- // @Override
- // public void testConcurrentOperations() throws Exception {
- // }
- //
- // @Override
- // public void testDistributedUpdate() {
- // }
- //
- // @Override
- // public void testDistributedGet() {
- // }
- //
- // @Override
- // public void testDistributedPutNoUpdate() throws InterruptedException {
- // }
- //
- // @Override
- // public void testDefinedEntryUpdated() {
- // }
- //
- // @Override
- // public void testDistributedDestroy() throws InterruptedException {
- // }
- //
- // @Override
- // public void testDistributedRegionDestroy() throws InterruptedException {
- // }
- //
- // @Override
- // public void testLocalRegionDestroy() throws InterruptedException {
- // }
- //
- // @Override
- // public void testDistributedInvalidate() {
- // }
- //
- // @Override
- // public void testDistributedInvalidate4() throws InterruptedException {
- // }
- //
- // @Override
- // public void testDistributedRegionInvalidate() throws InterruptedException
{
- // }
- //
- // @Override
- // public void testRemoteCacheListener() throws InterruptedException {
- // }
- //
- // @Override
- // public void testRemoteCacheListenerInSubregion() throws
InterruptedException {
- // }
- //
- // @Override
- // public void testRemoteCacheLoader() throws InterruptedException {
- // }
- //
- // @Override
- // public void testRemoteCacheLoaderArg() throws InterruptedException {
- // }
- //
- // @Override
- // public void testRemoteCacheLoaderException() throws InterruptedException {
- // }
- //
- // @Override
- // public void testCacheLoaderWithNetSearch() throws CacheException {
- // }
- //
- // @Override
- // public void testCacheLoaderWithNetLoad() throws CacheException {
- // }
- //
- // @Override
- // public void testNoRemoteCacheLoader() throws InterruptedException {
- // }
- //
- // @Override
- // public void testNoLoaderWithInvalidEntry() {
- // }
- //
- // @Override
- // public void testRemoteCacheWriter() throws InterruptedException {
- // }
- //
- // @Override
- // public void testLocalAndRemoteCacheWriters() throws InterruptedException {
- // }
- //
- // @Override
- // public void testCacheLoaderModifyingArgument() throws
InterruptedException {
- // }
- //
- // @Override
- // public void testRemoteLoaderNetSearch() throws CacheException {
- // }
- //
- // @Override
- // public void testLocalCacheLoader() {
- // }
- //
- // @Override
- // public void testDistributedPut() throws Exception {
- // }
- //
- // @Override
- // public void testReplicate() throws InterruptedException {
- // }
- //
- // @Override
- // public void testDeltaWithReplicate() throws InterruptedException {
- // }
- //
- // @Override
- // public void testGetInitialImage() {
- // }
- //
- // @Override
- // public void testLargeGetInitialImage() {
- // }
- //
- // @Override
- // public void testMirroredDataFromNonMirrored() throws InterruptedException
{
- // }
- //
- // @Override
- // public void testNoMirroredDataToNonMirrored() throws InterruptedException
{
- // }
- //
- // @Override
- // public void testMirroredLocalLoad() {
- // }
- //
- // @Override
- // public void testMirroredNetLoad() {
- // }
- //
- // @Override
- // public void testNoRegionKeepAlive() throws InterruptedException {
- // }
- //
- // @Override
- // public void testNetSearchObservesTtl() throws InterruptedException {
- // }
- //
- // @Override
- // public void testNetSearchObservesIdleTime() throws InterruptedException {
- // }
- //
- // @Override
- // public void testEntryTtlDestroyEvent() throws InterruptedException {
- // }
- //
- // @Override
- // public void testUpdateResetsIdleTime() throws InterruptedException {
- // }
- // @Override
- // public void testTXNonblockingGetInitialImage() throws Throwable {
- // }
- //
- // @Override
- // public void testNBRegionInvalidationDuringGetInitialImage() throws
Throwable {
- // }
- //
- // @Override
- // public void testNBRegionDestructionDuringGetInitialImage() throws
Throwable {
- // }
- //
- // @Override
- // public void testNoDataSerializer() {
- // }
- //
- // @Override
- // public void testNoInstantiator() {
- // }
- //
- // @Override
- // public void testTXSimpleOps() throws Exception {
- // }
- //
- // @Override
- // public void testTXUpdateLoadNoConflict() throws Exception {
- // }
- //
- // @Override
- // public void testTXMultiRegion() throws Exception {
- // }
- //
- // @Override
- // public void testTXRmtMirror() throws Exception {
- // }
-
-
}
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index 962ef34..7338eb7 100644
---
a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -52,7 +52,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -129,7 +128,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Abstract superclass of {@link Region} tests that involve more than one VM.
@@ -1091,8 +1089,6 @@ public abstract class MultiVMRegionTestCase extends
RegionTestCase {
/**
* Tests that a {@link CacheListener} is invoked in a remote VM.
*/
- @Category(FlakyTest.class) // GEODE-153 & GEODE-932: time sensitive,
waitForInvocation
- // (waitForCriterion), 3 second timeouts
@Test
public void testRemoteCacheListener() throws Exception {
assertTrue(getRegionAttributes().getScope().isDistributed());
@@ -3615,8 +3611,6 @@ public abstract class MultiVMRegionTestCase extends
RegionTestCase {
* Tests that an entry in a distributed region that expires with a
distributed destroy causes an
* event in other VM with isExpiration flag set.
*/
- @Category(FlakyTest.class) // GEODE-583: time sensitive, expiration,
waitForCriterion, short
- // timeouts
@Test
public void testEntryTtlDestroyEvent() throws Exception {
assumeTrue(getRegionAttributes().getPartitionAttributes() == null);
@@ -3790,8 +3784,6 @@ public abstract class MultiVMRegionTestCase extends
RegionTestCase {
* Tests that an entry in a distributed region expires with a local destroy
after a given time to
* live.
*/
- @Category(FlakyTest.class) // GEODE-671: time sensitive, expiration, retry
loop, async actions,
- // waitForCriterion
@Test
public void testEntryTtlLocalDestroy() throws Exception {
assumeTrue(getRegionAttributes().getPartitionAttributes() == null);
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
index 7de7fa6..723f3c8 100644
---
a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
@@ -56,7 +56,6 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This class tests the functionality of a cache {@link Region region} that
has a scope of
@@ -314,7 +313,6 @@ public class PartitionedRegionDUnitTest extends
MultiVMRegionTestCase {
/**
* test with multiple vms and a decent spread of keys
*/
- @Category(FlakyTest.class) // GEODE-555: retry loops, use of Random
@Test
public void testExtendedKeysValues() {
final String regionName = getUniqueName();
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
index 8c1abc8..ae0d34a 100644
---
a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
@@ -33,7 +33,6 @@ import java.util.concurrent.locks.Lock;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
@@ -78,7 +77,6 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests region reliability defined by MembershipAttributes.
@@ -943,8 +941,6 @@ public abstract class RegionReliabilityTestCase extends
ReliabilityTestCase {
/**
* Tests affect of FULL_ACCESS on local entry expiration actions.
*/
- @Category(FlakyTest.class) // GEODE-447: time sensitive, expiration,
waitForMemberTimeout is
- // unimplemented
@Test
public void testFullAccessWithLocalEntryExpiration() throws Exception {
final String name = this.getUniqueName();
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
index 7de4e43..93a39c6 100644
---
a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
@@ -91,7 +91,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class TXDistributedDUnitTest extends JUnit4CacheTestCase {
@@ -543,7 +542,6 @@ public class TXDistributedDUnitTest extends
JUnit4CacheTestCase {
return p;
}
- @Category(FlakyTest.class) // GEODE-635: eats and logs exceptions, retry
loops
@Test
public void testHighAvailabilityFeatures() throws Exception {
IgnoredException.addIgnoredException("DistributedSystemDisconnectedException");
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
index 6b75eca..085e4da 100755
---
a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.LocatorState;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.process.ProcessControllerFactory;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
@@ -70,7 +69,6 @@ public class LocatorLauncherRemoteIntegrationTest extends
LocatorLauncherRemoteI
}
@Test
- @Category(FlakyTest.class) // GEODE-3506
public void startDeletesStaleControlFiles() throws Exception {
File stopRequestFile = givenControlFile(getStopRequestFileName());
File statusRequestFile = givenControlFile(getStatusRequestFileName());
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
index fb7960d..f2dfce3 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.LogWriterUtils;
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 SystemAdminDUnitTest extends JUnit4DistributedTestCase {
@@ -61,7 +60,6 @@ public class SystemAdminDUnitTest extends
JUnit4DistributedTestCase {
}
}
- @Category(FlakyTest.class) // GEODE-1585
@Test
public void testPrintStacks() throws Exception {
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
index 37191ff..82757a8 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This class tests the functionality of the {@linkplain
org.apache.geode.internal.admin internal
@@ -118,7 +117,6 @@ public class ClusterDistributionManagerForAdminDUnitTest
extends CacheTestCase
assertThat(agent.isConnected()).isFalse();
}
- @Category(FlakyTest.class) // GEODE-1688
@Test
public void testApplications() throws Exception {
await().atMost(1, MINUTES)
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
index c1ba4ab..0c6a3c9 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.MembershipTest;
@Category({DistributedTest.class, MembershipTest.class})
@@ -61,7 +60,6 @@ public class ProductUseLogDUnitTest extends
JUnit4CacheTestCase {
return p;
}
- @Category(FlakyTest.class) // GEODE-3581 - test has Thread.sleep() and fails
intermittently
@Test
public void testMembershipMonitoring() throws Exception {
Host host = Host.getHost(0);
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
index 18f553c..4fc6be3 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
@@ -84,7 +83,6 @@ public class
ScheduledThreadPoolExecutorWithKeepAliveJUnitTest {
assertEquals(2, ex.getLargestPoolSize());
}
- @Category(FlakyTest.class) // GEODE-1138: time sensitive, thread sleeps,
expiration
@Test
public void testConcurrentExecutionAndExpiration()
throws InterruptedException, ExecutionException {
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
index 29391da..4e02e2a 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
@@ -120,7 +120,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests the basic client-server transaction functionality
@@ -1937,8 +1936,6 @@ public class ClientServerTransactionDUnitTest extends
RemoteTransactionDUnitTest
doFailoverWork(accessor1, accessor2, datastore, client, false, false);
}
- @Category(FlakyTest.class) // GEODE-1933: IllegalStateException: Thread does
not have an active
- // transaction
@Test
public void testFailoverWithP2PMessagingAndCachingProxy() {
Host host = Host.getHost(0);
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
index 232d2b3..e2ac109 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
@@ -70,7 +70,6 @@ import
org.apache.geode.internal.cache.control.InternalResourceManager;
import
org.apache.geode.internal.cache.control.InternalResourceManager.ResourceObserverAdapter;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.process.ProcessWrapper;
@@ -276,7 +275,6 @@ public class DeprecatedCacheServerLauncherIntegrationTest {
}
@Test
- @Category(FlakyTest.class) // GEODE-3939
public void testCreateBuckets() throws Exception {
this.registry = LocateRegistry.createRegistry(this.controllerNamingPort);
this.status = new RebalanceStatus();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
index 8829740..a97e13d 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
@@ -321,7 +320,6 @@ public class DiskRegionAsyncRecoveryJUnitTest extends
DiskRegionTestingBase {
}
}
- @Category(FlakyTest.class) // GEODE-1957: recovery does not always happen;
possible disk issue?
@Test
public void testCloseOpenRegion() throws InterruptedException {
Region region = createRegion();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
index 25d4663..2a0a812 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
@@ -68,7 +68,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
@@ -1286,8 +1285,6 @@ public class GIIDeltaDUnitTest extends
JUnit4CacheTestCase {
* In this test, GII thread will get the GIILock before tombstone GC, so
tombstone GC should wait
* for all GIIs to finish
*/
- @Category(FlakyTest.class) // GEODE-633: SLOW_DISTRIBUTION_MS, non-thread
safe test hook, async
- // actions, time sensitive, waitForCriterion,
thread joins, forceGC
@Test
public void testTombstoneGCInMiddleOfGII() throws Throwable {
prepareForEachTest();
@@ -1427,7 +1424,6 @@ public class GIIDeltaDUnitTest extends
JUnit4CacheTestCase {
* but igored at P. The deltaGII should send nothing to R since the RVVs are
the same. So after
* GII, P and R will have different tombstone number. But P's tombstones
should be expired.
*/
- @Category(FlakyTest.class)
@Test
public void testExpiredTombstoneSkippedAtProviderOnly() throws Throwable {
prepareForEachTest();
@@ -1643,8 +1639,6 @@ public class GIIDeltaDUnitTest extends
JUnit4CacheTestCase {
* for both members. R off line, then run P7. Restart R. It will trigger
deltaGII to chunk entry
* P7(key1). After that, do clear(). Make sure R should not contain key1
after GII.
*/
- @Category(FlakyTest.class) // GEODE-1068: time sensitive,
SLOW_DISTRIBUTION_MS, waitForCriterion,
- // possible thread unsafe test hooks, async
actions, depends on stats
@Test
public void testClearAfterChunkEntries() throws Throwable {
prepareForEachTest();
@@ -1834,7 +1828,6 @@ public class GIIDeltaDUnitTest extends
JUnit4CacheTestCase {
* P7,R6(3-6), R's RVV is P6,R6, RVVGC are both P4,R0 By changing
MAX_UNFINISHED_OPERATIONS to be
* 1, 2. It should be fullGII then deltaGII.
*/
- @Category(FlakyTest.class) // GEODE-686: time sensitive,
SLOW_DISTRIBUTION_MS, forceGC
@Test
public void testFullGIITriggeredByTooManyUnfinishedOps() throws Throwable {
prepareForEachTest();
@@ -2012,8 +2005,6 @@ public class GIIDeltaDUnitTest extends
JUnit4CacheTestCase {
* correct RVV on the GII recipient at the end.
*
*/
- @Category(FlakyTest.class) // GEODE-1137: orphaned AsyncInvocations, time
sensitive, GC,
- // waitForCriterion, thread unsafe test
hooks/observers, expiration
@Test
public void testTombstoneGCDuringFullGII() throws Throwable {
prepareForEachTest();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
index 82ae51f..8e99fad 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@SuppressWarnings("synthetic-access")
@Category(DistributedTest.class)
@@ -131,9 +130,6 @@ public class PartitionedRegionDelayedRecoveryDUnitTest
extends JUnit4CacheTestCa
vm2.invoke(checkNoBucket);
}
- @Category(FlakyTest.class) // GEODE-860: time sensitive, thread unsafe test
hook, CountDownLatch,
- // 1 minute timeout, waitForBucketRecovery loops
eating
- // InterruptedException
@Test
public void testDelay() {
Host host = Host.getHost(0);
@@ -202,9 +198,6 @@ public class PartitionedRegionDelayedRecoveryDUnitTest
extends JUnit4CacheTestCa
elapsed >= 5000);
}
- @Category(FlakyTest.class) // GEODE-757: time sensitive, fails because event
occurs 2 millis too
- // soon, waitForBucketRecovery wait loop eats
InterruptedException,
- // thread unsafe test hook
@Test
public void testStartupDelay() {
Host host = Host.getHost(0);
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index e26ac7f..c69d6ba 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -86,7 +86,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@Category({DistributedTest.class, ClientServerTest.class})
public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
@@ -652,8 +651,6 @@ public class PartitionedRegionSingleHopDUnitTest extends
JUnit4CacheTestCase {
assertFalse(cms.isRefreshMetadataTestOnly());
}
- @Category(FlakyTest.class) // GEODE-853: random ports, pause sleeps, time
sensitive, 5 second
- // thread sleeps
@Test
public void testServerLocationRemovalThroughPing() {
Integer port0 =
@@ -758,7 +755,6 @@ public class PartitionedRegionSingleHopDUnitTest extends
JUnit4CacheTestCase {
.until(() ->
(prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4));
}
- @Category(FlakyTest.class) // GEODE-1763
@Test
public void testMetadataIsSameOnAllServersAndClients() {
Integer port0 =
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
index 14e6605..7cce1e6 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.EvictionTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@Category({DistributedTest.class, EvictionTest.class})
public class EvictionStatsDUnitTest extends CacheTestCase {
@@ -303,7 +302,6 @@ public class EvictionStatsDUnitTest extends CacheTestCase {
}
@Test
- @Category(FlakyTest.class)
public void testMemLRUEvictionNDestroyNNumOverflowOnDiskCount() {
// Ignore this excetion as this can happen if pool is shutting down
IgnoredException
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
index 63cce7f..205b625 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.EvictionTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Performs eviction dunit tests for off-heap memory.
@@ -142,7 +141,6 @@ public class OffHeapEvictionDUnitTest extends
EvictionDUnitTest {
return ResourceType.OFFHEAP_MEMORY;
}
- @Category(FlakyTest.class) // GEODE-1770
@Override
public void testDummyInlineNCentralizedEviction() {
super.testDummyInlineNCentralizedEviction();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index 3842c27..7556544 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -76,7 +76,6 @@ 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;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
@Category({DistributedTest.class, FunctionServiceTest.class})
@@ -545,7 +544,6 @@ public class DistributedRegionFunctionExecutionDUnitTest
extends JUnit4Distribut
executeFunction_SendException();
}
- @Category(FlakyTest.class) // GEODE-632: random ports, eats exceptions
@Test
public void
testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer_NoLastResult()
{
VM empty1 = replicate3;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 100045e..ca9b0eb 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -68,7 +68,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
@Category({DistributedTest.class, ClientServerTest.class,
FunctionServiceTest.class})
@@ -360,7 +359,6 @@ public class PRClientServerRegionFunctionExecutionDUnitTest
extends PRClientServ
.serverMultiKeyExecution_SendException(isByName));
}
- @Category(FlakyTest.class) // GEODE-1595
@Test
public void testserverMultiKeyExecution_ThrowException() {
createScenario();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 44f5728..af10d22 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -61,7 +61,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
@Category({DistributedTest.class, ClientServerTest.class,
FunctionServiceTest.class})
@@ -188,7 +187,6 @@ public class
PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRCl
}
// retry attempts is 2
- @Category(FlakyTest.class) // GEODE-1806
@Test
public void testOnRegionFailoverWithOneServerDownHA() throws
InterruptedException {
IgnoredException.addIgnoredException("FunctionInvocationTargetException");
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 2c5e4f9..b1a6fb2 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -62,7 +62,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
@Category({DistributedTest.class, ClientServerTest.class,
FunctionServiceTest.class})
@@ -257,8 +256,6 @@ public class
PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
* should retry the function execution. After 5th attempt function will send
Boolean as last
* result.
*/
- @Category(FlakyTest.class) // GEODE-600: network sensitive, random ports,
configs lots of
- // PoolFactory network attributes
@Test
public void testserverMultiKeyExecution_FunctionInvocationTargetException() {
createScenario();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index 2b16f6a..456c4ae 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -64,7 +64,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
@Category({DistributedTest.class, ClientServerTest.class,
FunctionServiceTest.class})
@@ -294,7 +293,6 @@ public class
PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
* Ensure that the while executing the function if the servers is down then
the execution is
* failover to other available server
*/
- @Category(FlakyTest.class) // GEODE-1497
@Test
public void testServerFailoverWithTwoServerAliveHA() throws
InterruptedException {
IgnoredException.addIgnoredException("FunctionInvocationTargetException");
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
index 290b713..fb95a90 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -62,7 +62,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HARegionQueueDUnitTest extends JUnit4DistributedTestCase {
@@ -749,8 +748,6 @@ public class HARegionQueueDUnitTest extends
JUnit4DistributedTestCase {
*
* TODO: this test runs too long! Shorten run time. 1m 40s on new Mac.
*/
- @Category(FlakyTest.class) // GEODE-690: async queuing, time sensitive,
expiration,
- // waitForCriterion, joins
@Test
public void testNPEDueToHARegionQueueEscapeInConstructor() {
// changing EXPIRY_TIME to 5 doesn't change how long the test runs!
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 86a3d77..d23f40e 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -79,7 +79,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.RegionsTest;
@Category({DistributedTest.class, RegionsTest.class})
@@ -2133,7 +2132,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
checkData(vm0, 0, NUM_BUCKETS, "a", "region2");
}
- @Category(FlakyTest.class) // GEODE-506: time sensitive, async actions with
30 sec max
@Test
public void testRebalanceWithOfflineChildRegion() throws Throwable {
SerializableRunnable createParentPR = new
SerializableRunnable("createParentPR") {
@@ -2304,7 +2302,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
async2.getResult();
}
- @Category(FlakyTest.class) // GEODE-1380: time sensitive, async actions with
30 sec max
@Test
public void testRebalanceWithOfflineChildRegionTwoDiskStores() throws
Throwable {
SerializableRunnable createParentPR = new SerializableRunnable() {
@@ -2354,7 +2351,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
* Test that a user is not allowed to change the colocation of a PR with
persistent data.
*
*/
- @Category(FlakyTest.class) // GEODE-900: disk dependency, filesystem
sensitive
@Test
public void testModifyColocation() throws Throwable {
// Create PRs where region3 is colocated with region1.
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index 2a8f9ec..32bc796 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -953,7 +953,7 @@ public class PersistentPartitionedRegionDistributedTest
implements Serializable
}
@Test
- @Category(FlakyTest.class)
+ @Category(FlakyTest.class) // GEODE-5325
public void recoversFromCloseDuringRegionOperation() throws Exception {
vm0.invoke(() -> createPartitionedRegion(1, -1, 1, true));
vm1.invoke(() -> createPartitionedRegion(1, -1, 1, true));
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index fb11c94..6dfb417 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -449,7 +449,7 @@ public class FixedPartitioningDUnitTest extends
FixedPartitioningTestBase {
}
@Category(FlakyTest.class) // GEODE-567: async actions, waitForCriterion,
time sensitive,
- // non-thread-safe test hook, eats exceptions
(partially fixed)
+ // non-thread-safe test hook, eats exceptions (partially fixed)
@Test
public void testBug43283() {
member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
@@ -974,7 +974,6 @@ public class FixedPartitioningDUnitTest extends
FixedPartitioningTestBase {
* per primary and secondary FixedPartitionAttributes defined on datastores.
*/
- @Category(FlakyTest.class) // GEODE-1704
@Test
public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore() {
member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index 358802e..0bb8b4f 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -61,7 +61,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests propagation of destroy entry operation across the vms
@@ -188,8 +187,6 @@ public class DestroyEntryPropagationDUnitTest extends
JUnit4DistributedTestCase
* This tests whether the destroy are received by the sender or not if there
are situation of
* Interest List fail over
*/
- @Category(FlakyTest.class) // GEODE-897: random port, time sensitive,
waitForCriterion, 2 minute
- // timeouts, eats exception (1 fixed)
@Test
public void testVerifyDestroyNotReceivedBySender() {
final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY,
WAIT_DEFAULT).intValue();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
index b0d6e9e..49d18cd 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
@@ -56,7 +56,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* We have 2 servers and One client which registers some keys with durable
interest and some without
@@ -406,7 +405,6 @@ public class DurableRegistrationDUnitTest extends
JUnit4DistributedTestCase {
}
- @Category(FlakyTest.class) // GEODE-1537
@Test
public void testDurableClientWithRegistrationHA() {
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 582aa1d..7dec912 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
@@ -30,7 +30,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@SuppressWarnings({"rawtypes", "serial"})
@Category({DistributedTest.class, ClientSubscriptionTest.class})
@@ -329,7 +328,6 @@ 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-1998
@Test
public void testInterestRecoveryFailure() throws Exception {
IgnoredException.addIgnoredException("Server unreachable");
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 6cea897..b46485d 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Test to verify Startup. and failover during startup.
@@ -214,7 +213,6 @@ public class HAStartupAndFailoverDUnitTest extends
JUnit4DistributedTestCase {
/**
* verify that Primary Should Be Null And EPList Should Be Empty When All
Servers Are Dead
*/
- @Category(FlakyTest.class) // GEODE-1045: random ports, time senstive,
waitForCriterion
@Test
public void
testPrimaryShouldBeNullAndEPListShouldBeEmptyWhenAllServersAreDead()
throws Exception {
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 5e2a14f..37c22e9 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Test to verify that client side region.close() should unregister the client
with the server. It
@@ -96,7 +95,6 @@ public class RegionCloseDUnitTest extends
JUnit4DistributedTestCase {
}
- @Category(FlakyTest.class) // GEODE-2051
@Test
public void testCloseRegionOnClient() {
server1.invoke(() ->
RegionCloseDUnitTest.VerifyClientProxyOnServerBeforeClose());
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index 2aed4af..1a6294a 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -59,7 +59,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests the reliable messaging functionality - Client sends a periodic ack to
the primary server
@@ -111,7 +110,6 @@ public class ReliableMessagingDUnitTest extends
JUnit4DistributedTestCase {
* If the primary fails before receiving an ack from the messages it
delivered then it should send
* an ack to the new primary so that new primary can sends QRM to other
redundant servers.
*/
- @Category(FlakyTest.class) // GEODE-694: async queuing
@Test
public void testPeriodicAckSendByClientPrimaryFailover() throws Exception {
IgnoredException.addIgnoredException("java.net.ConnectException");
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
index 3ea44eb..8d5f922 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
@@ -86,7 +86,7 @@ public class AsyncEventQueueStatsDUnitTest extends
AsyncEventQueueTestBase {
/**
* Two listeners added to the same RR.
*/
- @Category({FlakyTest.class, WanTest.class}) // GEODE-4647
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-5097
@Test
public void testAsyncStatsTwoListeners() throws Exception {
Integer lnPort = createFirstLocatorWithDSId(1);
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
index 34fa145..fb9b987 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.process;
import static java.util.concurrent.TimeUnit.MINUTES;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Integration tests that should be executed under both {@link
ProcessStreamReader.ReadingMode}s.
@@ -42,7 +40,6 @@ public abstract class BaseProcessStreamReaderIntegrationTest
}
@Test
- @Category(FlakyTest.class) // GEODE-3461 and GEODE-3505
public void processTerminatesWhenDestroyed() throws Exception {
// arrange
givenRunningProcessWithStreamReaders(ProcessSleeps.class);
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
index 045c53a..1155dbf 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
@@ -45,7 +45,6 @@ import
org.apache.geode.distributed.LocatorLauncher.LocatorState;
import org.apache.geode.internal.process.io.EmptyFileWriter;
import org.apache.geode.internal.process.io.IntegerFileWriter;
import org.apache.geode.internal.process.io.StringFileWriter;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
@@ -189,7 +188,6 @@ public class FileProcessControllerIntegrationTest {
}
@Test
- @Category(FlakyTest.class) // GEODE-3778
public void status_withStatusRequestFileExists_doesNotFail() throws
Exception {
// arrange
FileProcessController controller = new FileProcessController(params, pid);
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
index cb73983..100c6b7 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
@@ -61,7 +61,6 @@ import
org.apache.geode.internal.statistics.platform.OsStatisticsFactory;
import org.apache.geode.internal.statistics.platform.ProcessStats;
import org.apache.geode.internal.stats50.VMStats50;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
@@ -403,7 +402,6 @@ public class GemFireStatSamplerIntegrationTest extends
StatSamplerTestCase {
/**
* Verifies that archive removal works correctly when
archive-disk-space-limit is specified.
*/
- @Category(FlakyTest.class) // GEODE-2286: need to rewrite with Awaitility
and longer timeouts
@Test
public void testArchiveRemoval() throws Exception {
final String dirName = this.testDir.getAbsolutePath();// + File.separator
+ this.testName;
diff --git
a/geode-core/src/test/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java
index 403b548..ff862fc 100644
---
a/geode-core/src/test/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.statistics.HostStatSampler;
import org.apache.geode.internal.statistics.SampleCollector;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Distributed tests for {@link MemberMXBean} attributes.
@@ -77,7 +76,6 @@ public class MemberMBeanAttributesDUnitTest extends
ManagementTestBase {
validateSystemAndOSAttributes(managedNodeList.get(0));
}
- @Category(FlakyTest.class) // GEODE-1482
@Test
public void testConfigAttributes() throws Exception {
initManagement(false);
diff --git
a/geode-core/src/test/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java
index bf141ed..5c6e05e 100644
---
a/geode-core/src/test/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
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})
@@ -93,7 +92,6 @@ public class RegionCreateDestroyDUnitTest extends
JUnit4CacheTestCase {
return props;
}
- @Category(FlakyTest.class) // GEODE-1922
@Test
public void testCreateDestroyValidRegion() throws InterruptedException {
Cache serverCache = getCache();
@@ -144,7 +142,6 @@ public class RegionCreateDestroyDUnitTest extends
JUnit4CacheTestCase {
});
}
- @Category(FlakyTest.class) // GEODE-1878
@Test
public void testCreateDestroyReservedRegion() throws InterruptedException {
Cache serverCache = getCache();
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index c667397..d08d3c0 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -71,11 +71,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.RegionsTest;
-@Category({DistributedTest.class, FlakyTest.class, RegionsTest.class}) //
GEODE-973 GEODE-2009
-// GEODE-3530
+@Category({DistributedTest.class, RegionsTest.class})
@SuppressWarnings("serial")
public class CreateAlterDestroyRegionCommandsDUnitTest extends
CliCommandTestBase {
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 5df743c..b27bfc3 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -83,11 +83,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Dunit class for testing gemfire data commands : get, put, remove, select,
rebalance
*/
-@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1182 GEODE-1249
- // GEODE-1404 GEODE-1430
- // GEODE-1487 GEODE-1496
- // GEODE-1561 GEODE-1822
- // GEODE-2006 GEODE-3530
+@Category({DistributedTest.class, FlakyTest.class}) // See GEODE-3530
description
@SuppressWarnings("serial")
public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
@@ -971,7 +967,7 @@ public class GemfireDataCommandsDUnitTest extends
CliCommandTestBase {
}
}
- @Test // FlakyTest: GEODE-1561
+ @Test
public void testSimulateForEntireDS() {
setupTestRebalanceForEntireDS();
// check if DistributedRegionMXBean is available so that command will not
fail
@@ -1019,7 +1015,7 @@ public class GemfireDataCommandsDUnitTest extends
CliCommandTestBase {
}
}
- @Test // FlakyTest: GEODE-1487
+ @Test
public void testRebalanceForEntireDS() {
setupTestRebalanceForEntireDS();
// check if DistributedRegionMXBean is available so that command will not
fail
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java
index d6b04cd..eb2e7be 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java
@@ -49,10 +49,9 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.util.test.TestUtil;
-@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1165
+@Category({DistributedTest.class})
public class ConfigurationPersistenceServiceUsingDirDUnitTest extends
JUnit4CacheTestCase {
@Override
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
index 068e515..80586d9 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
@@ -34,12 +34,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This is for testing running functions
- *
- *
*/
@Category(DistributedTest.class)
public class TestFunctionsDUnitTest extends ManagementTestBase {
@@ -79,7 +76,6 @@ public class TestFunctionsDUnitTest extends
ManagementTestBase {
return Integer.valueOf(bean.getNumRunningFunctions());
}
- @Category(FlakyTest.class) // GEODE-2072: waitForCriterion times out
@Test
public void testNumOfRunningFunctions() throws Exception {
initManagement(false);
diff --git
a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
index d3b7685..58a57c1 100644
---
a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
@@ -43,7 +43,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.memcached.GemFireMemcachedServer.Protocol;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
@@ -158,7 +157,6 @@ public class GemcachedDevelopmentJUnitTest {
assertNull(client.get("key1"));
}
- @Category(FlakyTest.class) // GEODE-1140: time sensitive, thread sleep
@Test
public void testExpiration() throws Exception {
MemcachedClient client = bootstrapClient();
diff --git
a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
index fd4c03c..ed60c46 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
@@ -39,7 +39,6 @@ import redis.clients.jedis.Jedis;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RedisTest;
@@ -139,7 +138,6 @@ public class HashesJUnitTest {
assertTrue(retSet.containsAll(keys));
}
- @Category(FlakyTest.class) // GEODE-1942
@Test
public void testHIncrBy() {
String key = randString();
@@ -177,7 +175,6 @@ public class HashesJUnitTest {
for (int i = 0; i < length; i++)
rString.append((char) (rand.nextInt(57) + 65));
return rString.toString();
- // return Long.toHexString(Double.doubleToLongBits(Math.random()));
}
@After
diff --git
a/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
b/geode-core/src/test/java/org/apache/geode/redis/RedisServerIntegrationTest.java
similarity index 82%
rename from geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
rename to
geode-core/src/test/java/org/apache/geode/redis/RedisServerIntegrationTest.java
index 5e40a40..dd531bb 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
+++
b/geode-core/src/test/java/org/apache/geode/redis/RedisServerIntegrationTest.java
@@ -25,15 +25,16 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.internal.AvailablePort;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RedisTest;
@Category({IntegrationTest.class, RedisTest.class})
-public class RedisServerTest {
+public class RedisServerIntegrationTest {
- Cache cache;
- GeodeRedisServer redisServer;
+ private Cache cache;
+ private GeodeRedisServer redisServer;
+ private int redisPort;
@Before
public void createCache() {
@@ -41,6 +42,8 @@ public class RedisServerTest {
props.setProperty("mcast-port", "0");
CacheFactory cacheFactory = new CacheFactory(props);
cache = cacheFactory.create();
+ redisPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+ assert (cache.rootRegions().size() == 0);
}
@After
@@ -52,22 +55,16 @@ public class RedisServerTest {
}
@Test
- @Category(FlakyTest.class) // GEODE-3065
public void initializeRedisCreatesThreeRegions() {
- createCache();
- assert (cache.rootRegions().size() == 0);
- redisServer = new GeodeRedisServer(0);
+ redisServer = new GeodeRedisServer(redisPort);
redisServer.start();
assert cache.rootRegions().size() == 2 : cache.rootRegions().size();
assert cache.getRegion(GeodeRedisServer.REDIS_META_DATA_REGION) != null;
}
@Test
- @Category(FlakyTest.class) // GEODE-3065
public void initializeRedisCreatesPartitionedRegionByDefault() {
- createCache();
- assert (cache.rootRegions().size() == 0);
- redisServer = new GeodeRedisServer(0);
+ redisServer = new GeodeRedisServer(redisPort);
redisServer.start();
Region r = cache.getRegion(GeodeRedisServer.STRING_REGION);
assert r.getAttributes().getDataPolicy() == DataPolicy.PARTITION :
r.getAttributes()
@@ -75,12 +72,9 @@ public class RedisServerTest {
}
@Test
- @Category(FlakyTest.class) // GEODE-3065
public void initializeRedisCreatesRegionsUsingSystemProperty() {
- createCache();
- assert (cache.rootRegions().size() == 0);
System.setProperty("gemfireredis.regiontype", "REPLICATE");
- redisServer = new GeodeRedisServer(0);
+ redisServer = new GeodeRedisServer(redisPort);
redisServer.start();
Region r = cache.getRegion(GeodeRedisServer.STRING_REGION);
assert r.getAttributes().getDataPolicy() == DataPolicy.REPLICATE :
r.getAttributes()
diff --git
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
index 0ae31a2..101ba1d 100644
---
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
@@ -31,12 +31,10 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.ClientVM;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-// flaky: GEODE-3692
-@Category({DistributedTest.class, SecurityTest.class, FlakyTest.class})
+@Category({DistributedTest.class, SecurityTest.class})
public class ClientAuthDUnitTest {
@Rule
public ClusterStartupRule lsRule = new ClusterStartupRule();
diff --git
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
index 276272e..88e2b3f 100644
---
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
@@ -25,7 +25,6 @@ import org.junit.runners.Parameterized;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -71,7 +70,6 @@ public class ClientAuthenticationDUnitTest extends
ClientAuthenticationTestCase
doTestInvalidCredentials(false);
}
- @Category(FlakyTest.class) // GEODE-1683
@Test
public void testInvalidAuthInit() throws Exception {
doTestInvalidAuthInit(false);
@@ -97,7 +95,6 @@ public class ClientAuthenticationDUnitTest extends
ClientAuthenticationTestCase
doTestCredentialsWithFailover(false);
}
- @Category(FlakyTest.class) // GEODE-838: random ports, thread sleeps, time
sensitive
@Test
public void testCredentialsForNotifications() throws Exception {
doTestCredentialsForNotifications(false);
diff --git
a/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
index 8d899b1..8baf5ed 100644
---
a/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
@@ -42,7 +42,6 @@ import
org.apache.geode.security.generator.AuthzCredentialGenerator;
import org.apache.geode.security.generator.CredentialGenerator;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
/**
@@ -67,7 +66,6 @@ public class DeltaClientPostAuthorizationDUnitTest extends
ClientAuthorizationTe
closeCache();
}
- @Category(FlakyTest.class) // GEODE-1502
@Test
public void testPutPostOpNotifications() throws Exception {
OperationWithAction[] allOps = allOps();
diff --git
a/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
index 117000a..f52e96a 100644
---
a/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.test.dunit.Host;
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;
/**
@@ -183,7 +182,6 @@ public class P2PAuthenticationDUnitTest extends
JUnit4DistributedTestCase {
/**
* Authenticator is incorrect
*/
- @Category(FlakyTest.class) // GEODE-1089: random port
@Test
public void testP2PAuthenticationWithInvalidAuthenticator() throws Exception
{
int locatorPort = getRandomAvailablePort(SOCKET);
@@ -213,7 +211,6 @@ public class P2PAuthenticationDUnitTest extends
JUnit4DistributedTestCase {
}
}
- @Category(FlakyTest.class) // GEODE-1091: random port
@Test
public void testP2PAuthenticationWithNoCredentials() throws Exception {
int locatorPort = getRandomAvailablePort(SOCKET);
diff --git
a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
index fff53a9..8d6a2cd 100644
---
a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
+++
b/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
@@ -29,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -62,7 +61,6 @@ public class SecurityManagerLifecycleIntegrationTest {
}
}
- @Category(FlakyTest.class) // GEODE-1661
@Test
public void initAndCloseTest() {
SpySecurityManager ssm = (SpySecurityManager)
this.securityService.getSecurityManager();
diff --git
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
index bb1439c..f456ff6 100644
---
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This class tests the ContiunousQuery mechanism in GemFire. This includes
the test with diffetent
@@ -413,8 +412,6 @@ public class CqPerfDUnitTest extends JUnit4CacheTestCase {
* CQs.
*
*/
- @Category(FlakyTest.class) // GEODE-1164: random ports, thread sleeps, time
sensitive, eats
- // exceptions (fixed 1), async behavior
@Test
public void testMatchingCqs() throws Exception {
diff --git
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index dc4f7e1..391cd62 100644
---
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This class tests the ContinuousQuery mechanism in GemFire.
@@ -919,7 +918,6 @@ public class CqResultSetUsingPoolDUnitTest extends
JUnit4CacheTestCase {
* Tests CQ Result Caching with CQ Failover.
*
*/
- @Category(FlakyTest.class) // GEODE-1251
@Test
public void testCqResultsCachingWithFailOver() throws Exception {
final Host host = Host.getHost(0);
diff --git
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index 50a6d37..b770a90 100644
---
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -57,7 +57,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Test class for Partitioned Region and CQs
@@ -1067,8 +1066,6 @@ public class PrCqUsingPoolDUnitTest extends
JUnit4CacheTestCase {
* inconsistent.
*
*/
- @Category(FlakyTest.class) // GEODE-1181, 1253: random ports, eats
exceptions (fixed some), async
- // behavior
@Test
public void testEventsDuringQueryExecution() throws Exception {
final Host host = Host.getHost(0);
diff --git
a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
index 5a82615..1a7ca4b 100755
---
a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
@@ -103,7 +103,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests putAll for c/s. Also tests removeAll
@@ -3616,7 +3615,6 @@ public class PutAllCSDUnitTest extends
ClientServerTestCase {
/**
* basically same test as testVersionsOnClientsWithNotificationsOnly but
also do a removeAll
*/
- @Category(FlakyTest.class) // GEODE-1419
@Test
public void testRAVersionsOnClientsWithNotificationsOnly() {
final String title = "testRAVersionsInClients";
diff --git
a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 32e3985..4b40172 100644
---
a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -67,7 +67,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
@@ -135,7 +134,6 @@ public class DurableClientSimpleDUnitTest extends
DurableClientTestCase {
/**
* Test that a durable client VM with multiple BridgeClients correctly
registers on the server.
*/
- @Category(FlakyTest.class) // GEODE-1618
@Test
public void testMultipleBridgeClientsInSingleDurableVM() {
// Start a server
@@ -2965,8 +2963,6 @@ public class DurableClientSimpleDUnitTest extends
DurableClientTestCase {
/**
* Tests scenario where close cq will throw an exception due to a client
being reactivated
*/
- @Category(FlakyTest.class) // GEODE-1060: random ports, async actions, time
sensitive, eats
- // exceptions (fixed 1)
@Test
public void testCqCloseExceptionDueToActivatingClient() throws Exception {
try {
diff --git
a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index 87db95b..49694af 100644
---
a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -60,8 +60,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.GfshTest;
-@Category({DistributedTest.class, FlakyTest.class, GfshTest.class}) //
GEODE-1705 GEODE-3404
- //
GEODE-3359 GEODE-3530
+@Category({DistributedTest.class, FlakyTest.class, GfshTest.class}) // See
GEODE-3530
@SuppressWarnings("serial")
public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
diff --git
a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
index dc90a9c..38493e6 100755
---
a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
@@ -35,7 +35,6 @@ import
org.apache.geode.security.generator.DummyAuthzCredentialGenerator;
import org.apache.geode.security.generator.DummyCredentialGenerator;
import org.apache.geode.security.templates.UserPasswordAuthInit;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
/**
@@ -72,7 +71,6 @@ public class ClientAuthzObjectModDUnitTest extends
ClientAuthorizationTestCase {
() -> Instantiator.register(new MyInstantiator(), false));
}
- @Category(FlakyTest.class) // GEODE-2071: failed with
ForcedDisconnectException
@Test
public void testAllOpsObjectModWithFailover() throws Exception {
OperationWithAction[] allOps = allOps();
diff --git
a/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
index 5cff625..f96ee9d 100644
---
a/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.test.junit.categories.SecurityTest;
@Category({DistributedTest.class, SecurityTest.class})
public class ClientPostAuthorizationDUnitTest extends
ClientAuthorizationTestCase {
- @Category(FlakyTest.class) // GEODE-693: getRandomAvailablePort
@Test
public void testAllPostOps() throws Exception {
OperationWithAction[] allOps = allOpsForTestAllPostOps();
@@ -114,8 +113,8 @@ public class ClientPostAuthorizationDUnitTest extends
ClientAuthorizationTestCas
}
}
- @Category(FlakyTest.class) // GEODE-1009: random ports, uses Random, time
sensitive,
- // waitForCondition (waitForCriterion)
+ // GEODE-1009: random ports, uses Random, time sensitive, waitForCondition
(waitForCriterion)
+ @Category(FlakyTest.class)
@Test
public void testAllOpsNotifications() throws Exception {
OperationWithAction[] allOps = allOpsForTestAllOpsNotifications();
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 8ad5d53..e94a78e 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.WanTest;
@Category({DistributedTest.class, WanTest.class})
@@ -232,7 +231,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort));
}
- @Category({FlakyTest.class, WanTest.class}) // GEODE-1920
+ @Category({WanTest.class})
@Test
public void test_NY_Recognises_TK_AND_HK_Simultaneously() {
Map<Integer, Set<InetSocketAddress>> dsVsPort = new HashMap<>();
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 3d3b7ce..1965734 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.WanTest;
@Category({DistributedTest.class, WanTest.class})
@@ -128,7 +127,7 @@ public class
ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTest
/**
* Enable persistence for the GatewaySender but not the region
*/
- @Category({FlakyTest.class, WanTest.class}) // GEODE-1670
+ @Category({WanTest.class})
@Test
public void testPartitionedRegionWithPersistentGatewaySender() {
Integer lnPort = (Integer) vm0.invoke(() ->
WANTestBase.createFirstLocatorWithDSId(1));
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index e8f0f50..1758341 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.WanTest;
@Category({DistributedTest.class, WanTest.class})
@@ -279,7 +278,7 @@ public class ParallelWANPropagationDUnitTest extends
WANTestBase {
* after the local site was built back.
*
*/
- @Category({FlakyTest.class, WanTest.class})
+ @Category({WanTest.class})
@Test
public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws
Exception {
Integer lnPort = (Integer) vm0.invoke(() ->
WANTestBase.createFirstLocatorWithDSId(1));
@@ -453,7 +452,7 @@ public class ParallelWANPropagationDUnitTest extends
WANTestBase {
vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() +
"_child2", 0));
}
- @Category({FlakyTest.class, WanTest.class}) // GEODE-1312
+ @Category({WanTest.class})
@Test
public void testParallelPropagationWithOverflow() throws Exception {
Integer lnPort = (Integer) vm0.invoke(() ->
WANTestBase.createFirstLocatorWithDSId(1));
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index a73fefc..3a3738d 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.WanTest;
@Category({DistributedTest.class, WanTest.class})
@@ -388,7 +387,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase {
vm3.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS,
NUM_PUTS));
}
- @Category({FlakyTest.class, WanTest.class}) // GEODE-2176
+ @Category({WanTest.class})
@Test
public void testParallelPropagationHA() throws Exception {
Integer lnPort = (Integer) vm0.invoke(() ->
WANTestBase.createFirstLocatorWithDSId(1));
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
index ba271aa..abf795d 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.WanTest;
@Category({DistributedTest.class, WanTest.class})
@@ -593,7 +592,7 @@ public class SerialWANPropagationDUnitTest extends
WANTestBase {
* remote site. Puts to the local region are in progress. Receiver on remote
site is stopped in
* the middle by closing remote site cache.
*/
- @Category({FlakyTest.class, WanTest.class}) // GEODE-1552
+ @Category({WanTest.class})
@Test
public void testReplicatedSerialPropagationWithRemoteReceiverStopped()
throws Exception {
Integer lnPort = (Integer) vm0.invoke(() ->
WANTestBase.createFirstLocatorWithDSId(1));
diff --git
a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
index 2b3b7fd..eb3d22d 100644
---
a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.WanTest;
/**
@@ -109,7 +108,7 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
WANTestBase.checkSenderMBean(managing, getTestMethodName() + "_PR", false);
}
- @Category({FlakyTest.class, WanTest.class}) // GEODE-1603
+ @Category({WanTest.class})
@Test
public void testReceiverMBean() throws Exception {
@@ -261,7 +260,7 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
});
}
- @Category({FlakyTest.class, WanTest.class}) // GEODE-1629
+ @Category({WanTest.class})
@Test
public void testMBeanCallbackInRemoteCluster() throws Exception {
