GEODE-8555: SimpleDiskRegionJunitTest fails on Windows (apache#5569)

kekerzzZ · Oct 1, 2020 · a4c6c24 · a4c6c24
1 parent 64e5682
commit a4c6c24
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/...e/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java b/...e/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
@@ -22,7 +22,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
 
 import java.io.File;
 import java.util.Collections;
@@ -32,7 +31,6 @@
 import org.junit.Test;
 
 import org.apache.geode.StatisticsFactory;
-import org.apache.geode.internal.lang.SystemUtils;
 import org.apache.geode.test.dunit.ThreadUtils;
 
 /**
@@ -56,9 +54,8 @@ protected final void postSetUp() throws Exception {
    */
   @Test
   public void testBasicClose() {
-    assumeFalse(SystemUtils.isWindows());
     {
-      deleteFiles();
+      forceDeleteFiles();
       try {
         region = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache, diskProps);
       } catch (Exception e) {
@@ -70,7 +67,7 @@ public void testBasicClose() {
       checkIfContainsFileWithExt("lk");
     }
     {
-      deleteFiles();
+      forceDeleteFiles();
       try {
         region = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache, diskProps);
       } catch (Exception e) {
@@ -82,7 +79,7 @@ public void testBasicClose() {
       checkIfContainsFileWithExt("lk");
     }
     {
-      deleteFiles();
+      forceDeleteFiles();
       try {
         region = DiskRegionHelperFactory.getAsyncPersistOnlyRegion(cache, diskProps);
       } catch (Exception e) {

diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java b/geode-junit/src/main/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
@@ -30,9 +30,11 @@
 import java.util.Iterator;
 import java.util.Properties;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
+import org.junit.rules.ErrorCollector;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 
@@ -79,6 +81,9 @@ public abstract class DiskRegionTestingBase {
   @Rule
   public TemporaryFolder tempDir = new TemporaryFolder();
 
+  @Rule
+  public ErrorCollector errorCollector = new ErrorCollector();
+
   @Before
   public final void setUp() throws Exception {
     preSetUp();
@@ -200,6 +205,21 @@ protected void deleteFiles() {
     tempDir.delete();
   }
 
+  protected void forceDeleteFiles() {
+    closeDiskStores();
+    File file = tempDir.getRoot();
+    File[] files = file.listFiles();
+    for (File each : files) {
+      try {
+        if (!each.getName().contains(".gfs")) {
+          FileUtils.forceDelete(each);
+        }
+      } catch (IOException e) {
+        errorCollector.addError(e);
+      }
+    }
+  }
+
   protected void closeDiskStores() {
     if (cache != null) {
       ((GemFireCacheImpl) cache).closeDiskStores();