You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2018/01/29 20:26:12 UTC
[geode] branch develop updated (d0fef0f -> c3ead73)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from d0fef0f GEODE-3915: use ClassName type for cache-loader, writer and listeners (#1327)
new 4e7a98f GEODE-4418: add FlakyTest category to testMemLRUEvictionNDestroyNNumOverflowOnDiskCount
new aab2332 GEODE-4390: add FlakyTest category to testCloseDiskStoreWhenPut
new c3ead73 GEODE-4418: add FlakyTest category to testCleanupAfterConflict
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../internal/cache/eviction/EvictionStatsDUnitTest.java | 17 +++++++----------
.../cache/eviction/OffHeapEvictionStatsDUnitTest.java | 5 ++---
.../cache/partitioned/PersistPRKRFDUnitTest.java | 7 +++++--
.../PersistentPartitionedRegionDUnitTest.java | 16 ++++++++--------
4 files changed, 22 insertions(+), 23 deletions(-)
--
To stop receiving notification emails like this one, please contact
klund@apache.org.
[geode] 01/03: GEODE-4418: add FlakyTest category to
testMemLRUEvictionNDestroyNNumOverflowOnDiskCount
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4e7a98f10915b959134e13808f3021401012c2d8
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Jan 29 12:24:09 2018 -0800
GEODE-4418: add FlakyTest category to testMemLRUEvictionNDestroyNNumOverflowOnDiskCount
---
.../internal/cache/eviction/EvictionStatsDUnitTest.java | 17 +++++++----------
.../cache/eviction/OffHeapEvictionStatsDUnitTest.java | 5 ++---
2 files changed, 9 insertions(+), 13 deletions(-)
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 001b9d7..1a2d156 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
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.eviction;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.Iterator;
@@ -39,7 +41,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.RegionMap;
import org.apache.geode.internal.cache.control.HeapMemoryMonitor;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.test.dunit.Assert;
@@ -48,12 +49,12 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
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.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
@Category(DistributedTest.class)
-public class EvictionStatsDUnitTest extends JUnit4CacheTestCase {
+public class EvictionStatsDUnitTest extends CacheTestCase {
protected static Cache cache = null;
@@ -69,11 +70,6 @@ public class EvictionStatsDUnitTest extends JUnit4CacheTestCase {
static int totalNoOfBuckets = 2;
- public EvictionStatsDUnitTest() {
- super();
- // TODO Auto-generated constructor stub
- }
-
@Override
public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
@@ -306,6 +302,7 @@ public class EvictionStatsDUnitTest extends JUnit4CacheTestCase {
}
@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/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
index 278c774..9ccaed7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.cache.eviction;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static org.junit.Assert.assertNotNull;
import java.util.Properties;
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.OffHeapTestUtil;
-import org.apache.geode.internal.cache.eviction.EvictionStatsDUnitTest;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
--
To stop receiving notification emails like this one, please contact
klund@apache.org.
[geode] 03/03: GEODE-4418: add FlakyTest category to
testCleanupAfterConflict
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c3ead73d63d8ec1eec17265752e158686030c8ad
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Jan 29 12:25:29 2018 -0800
GEODE-4418: add FlakyTest category to testCleanupAfterConflict
---
.../PersistentPartitionedRegionDUnitTest.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 1da1882..325496d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -14,11 +14,14 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.*;
-import static org.junit.Assert.*;
+import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.DataInput;
import java.io.DataOutput;
@@ -112,10 +115,6 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
// 60 seconds.
private static final int MAX_WAIT = 65 * 1000;
- public PersistentPartitionedRegionDUnitTest() {
- super();
- }
-
/**
* A simple test case that we are actually persisting with a PR.
*/
@@ -2050,6 +2049,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
}
@Test
+ @Category(FlakyTest.class)
public void testCleanupAfterConflict() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
--
To stop receiving notification emails like this one, please contact
klund@apache.org.
[geode] 02/03: GEODE-4390: add FlakyTest category to
testCloseDiskStoreWhenPut
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit aab2332dac62a897dae9088d9cbe5e774b04d1d6
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Jan 29 12:25:06 2018 -0800
GEODE-4390: add FlakyTest category to testCloseDiskStoreWhenPut
---
.../geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java
index e8fb004..efb4c2f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFDUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.util.Properties;
@@ -41,13 +42,14 @@ 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.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests the basic use cases for PR persistence.
- *
*/
@Category(DistributedTest.class)
public class PersistPRKRFDUnitTest extends PersistentPartitionedRegionTestBase {
+
private static final int NUM_BUCKETS = 15;
private static final int MAX_WAIT = 30 * 1000;
static Object lockObject = new Object();
@@ -59,6 +61,7 @@ public class PersistPRKRFDUnitTest extends PersistentPartitionedRegionTestBase {
* "-Ddisk.KRF_DEBUG=true";
*/
@Test
+ @Category(FlakyTest.class)
public void testCloseDiskStoreWhenPut() {
final String title = "testCloseDiskStoreWhenPut:";
Host host = Host.getHost(0);
--
To stop receiving notification emails like this one, please contact
klund@apache.org.