[geode] branch develop updated: GEODE-3205: GEODE-2790: fix flakiness in DiskSpaceLimitIntegrationTest (#1350)

[klund]

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


The following commit(s) were added to refs/heads/develop by this push:
     new ebc1d5e  GEODE-3205: GEODE-2790: fix flakiness in 
DiskSpaceLimitIntegrationTest (#1350)
ebc1d5e is described below

commit ebc1d5eb68efc07ddc694ae20d0de01fde52021a
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Jan 29 09:23:08 2018 -0800

    GEODE-3205: GEODE-2790: fix flakiness in DiskSpaceLimitIntegrationTest 
(#1350)
---
 .../statistics/DiskSpaceLimitIntegrationTest.java        | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
index 7b2c48a..f680984 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
@@ -45,13 +45,12 @@ import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
 import org.apache.geode.internal.io.RollingFileHandler;
 import org.apache.geode.internal.util.ArrayUtils;
-import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
 /**
  * Flaky: GEODE-2790, GEODE-3205
  */
-@Category({IntegrationTest.class, FlakyTest.class})
+@Category(IntegrationTest.class)
 @SuppressWarnings("unused")
 public class DiskSpaceLimitIntegrationTest {
 
@@ -205,7 +204,7 @@ public class DiskSpaceLimitIntegrationTest {
     sampleUntilFileExists(archiveFile(newMainId, 1));
     assertThat(archiveFile(newMainId, 1)).exists();
 
-    validateNumberFiles(2);
+    validateNumberFilesIsAtLeast(2);
 
     for (int childId = 1; childId <= numberOfPreviousFiles; childId++) {
       assertThat(archiveFile(oldMainId, childId)).doesNotExist();
@@ -253,8 +252,7 @@ public class DiskSpaceLimitIntegrationTest {
     sampleUntilFileExists(archiveFile(newMainId, 1));
     assertThat(archiveFile(newMainId, 1)).exists();
 
-    // this might be a brittle assertion... ok to delete if following 
for-block-assertion passes
-    validateNumberFiles(2);
+    validateNumberFilesIsAtLeast(2);
 
     for (int childId = 1; childId <= numberOfPreviousFiles; childId++) {
       assertThat(archiveFile(oldMainId, childId)).doesNotExist();
@@ -269,6 +267,14 @@ public class DiskSpaceLimitIntegrationTest {
         .isEqualTo(expected);
   }
 
+  /**
+   * Validates number of files under this.dir while ignoring 
this.dirOfDeletedFiles.
+   */
+  private void validateNumberFilesIsAtLeast(final int expected) {
+    assertThat(numberOfFiles(this.dir)).as("Unexpected files: " + 
listFiles(this.dir))
+        .isGreaterThanOrEqualTo(expected);
+  }
+
   private void sampleNumberOfTimes(final int value) throws 
InterruptedException {
     long minutes = 1;
     long timeout = System.nanoTime() + MINUTES.toNanos(minutes);

-- 
To stop receiving notification emails like this one, please contact
kl...@apache.org.