You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/09/15 22:03:19 UTC
incubator-geode git commit: GEODE-599: Remove Flaky annotation from
previously failing tests
Repository: incubator-geode
Updated Branches:
refs/heads/develop 45ecd4cb1 -> 67ac4de20
GEODE-599: Remove Flaky annotation from previously failing tests
This closes #239
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/67ac4de2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/67ac4de2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/67ac4de2
Branch: refs/heads/develop
Commit: 67ac4de20b30975fd6e7ff8ba9a41fe665528c90
Parents: 45ecd4c
Author: Scott Jewell <sj...@pivotal.io>
Authored: Wed Sep 14 15:54:31 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Thu Sep 15 15:02:54 2016 -0700
----------------------------------------------------------------------
...istributedAckOverflowRegionCCEDUnitTest.java | 22 +-------------------
.../DistributedAckRegionCCEDUnitTest.java | 4 +---
2 files changed, 2 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/67ac4de2/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
index ea9fa17..a5d8860 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
@@ -68,25 +68,5 @@ public class DistributedAckOverflowRegionCCEDUnitTest extends
5, EvictionAction.OVERFLOW_TO_DISK));
}
return factory.create();
- }
-
- @Override
- @Ignore
- @Test
- public void testClearWithConcurrentEvents() throws Exception {
- // TODO this test is disabled due to frequent failures. See bug #
- // Remove this method from this class when the problem is fixed
-// super.testClearWithConcurrentEvents();
- }
-
- @Override
- @Ignore
- @Test
- public void testClearWithConcurrentEventsAsync() throws Exception {
- // TODO this test is disabled due to frequent failures. See bug #
- // Remove this method from this class when the problem is fixed
-// super.testClearWithConcurrentEventsAsync();
- }
-
-
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/67ac4de2/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
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 110dbcc..0f6721d 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
@@ -271,19 +271,17 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
versionTestConcurrentEvents();
}
- @Category(FlakyTest.class) // GEODE-720: time sensitive, async actions, thread sleeps
@Test
public void testClearWithConcurrentEvents() throws Exception {
z_versionTestClearWithConcurrentEvents(true);
}
- @Category(FlakyTest.class) // GEODE-599 and GEODE-1046: async actions, thread sleeps -- // GEODE-1046: this may be hitting a product bug!
@Test
public void testClearWithConcurrentEventsAsync() throws Exception {
versionTestClearWithConcurrentEventsAsync();
}
- @Category(FlakyTest.class) // bug #45704
+ @Ignore("Enable after fix for bug GEODE-1891 was #45704")
@Test
public void testClearOnNonReplicateWithConcurrentEvents() throws Exception {
versionTestClearOnNonReplicateWithConcurrentEvents();