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 <[email protected]>
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
[email protected].

Reply via email to