[geode] branch develop updated: GEODE-8555: SimpleDiskRegionJunitTest fails on Windows (#5569)

[onichols]

This is an automated email from the ASF dual-hosted git repository.

onichols 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 a4c6c24  GEODE-8555: SimpleDiskRegionJunitTest fails on Windows (#5569)
a4c6c24 is described below

commit a4c6c246dcca0a73a0d31a8ebfeac326c9b409aa
Author: Sarah <41928668+sabbe...@users.noreply.github.com>
AuthorDate: Wed Sep 30 23:57:22 2020 -0400

    GEODE-8555: SimpleDiskRegionJunitTest fails on Windows (#5569)
---
 .../internal/cache/SimpleDiskRegionJUnitTest.java    |  9 +++------
 .../geode/internal/cache/DiskRegionTestingBase.java  | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
index 03c3ea1..1ddcbe6 100755
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
@@ -22,7 +22,6 @@ package org.apache.geode.internal.cache;
 
 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 java.util.Set;
 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 @@ public class SimpleDiskRegionJUnitTest extends 
DiskRegionTestingBase {
    */
   @Test
   public void testBasicClose() {
-    assumeFalse(SystemUtils.isWindows());
     {
-      deleteFiles();
+      forceDeleteFiles();
       try {
         region = 
DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache, diskProps);
       } catch (Exception e) {
@@ -70,7 +67,7 @@ public class SimpleDiskRegionJUnitTest extends 
DiskRegionTestingBase {
       checkIfContainsFileWithExt("lk");
     }
     {
-      deleteFiles();
+      forceDeleteFiles();
       try {
         region = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache, 
diskProps);
       } catch (Exception e) {
@@ -82,7 +79,7 @@ public class SimpleDiskRegionJUnitTest extends 
DiskRegionTestingBase {
       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
index 10dc789..d2de0b8 100644
--- 
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.HashMap;
 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 @@ public abstract class DiskRegionTestingBase {
     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();