Update test before/after steps to avoid problems with locked files

Unidata · Feb 22, 2024 · 3188915 · 3188915
1 parent f734885
commit 3188915
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 2 deletions.
diff --git a/tds/src/integrationTests/java/thredds/server/services/TestAdminDebug.java b/tds/src/integrationTests/java/thredds/server/services/TestAdminDebug.java
@@ -1,5 +1,6 @@
 package thredds.server.services;
 
+import static thredds.server.util.AdminDebugUtils.*;
 import java.nio.charset.StandardCharsets;
 import org.apache.http.HttpStatus;
 import org.apache.http.auth.Credentials;
@@ -28,8 +29,6 @@
 public class TestAdminDebug {
   private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  private static String urlPrefix = "https://localhost:8443/thredds/";
-  private static Credentials goodCred = new UsernamePasswordCredentials("tds", "secret666");
   private static Credentials badCred = new UsernamePasswordCredentials("bad", "worse");
 
   @Parameterized.Parameters(name = "{0}")

diff --git a/tds/src/integrationTests/java/thredds/server/util/AdminDebugUtils.java b/tds/src/integrationTests/java/thredds/server/util/AdminDebugUtils.java
@@ -0,0 +1,22 @@
+package thredds.server.util;
+
+import javax.servlet.http.HttpServletResponse;
+import org.apache.http.auth.Credentials;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import thredds.test.util.TestOnLocalServer;
+import thredds.util.ContentType;
+
+public class AdminDebugUtils {
+  public static final String urlPrefix = "https://localhost:8443/thredds/";
+  public static final Credentials goodCred = new UsernamePasswordCredentials("tds", "secret666");
+
+  public static void disableRafCache() {
+    final String endpoint = urlPrefix + "admin/debug?Caches/disableRAFCache";
+    TestOnLocalServer.getContent(goodCred, endpoint, new int[] {HttpServletResponse.SC_OK}, ContentType.html);
+  }
+
+  public static void enableRafCache() {
+    final String endpoint = urlPrefix + "admin/debug?Caches/enableRAFCache";
+    TestOnLocalServer.getContent(goodCred, endpoint, new int[] {HttpServletResponse.SC_OK}, ContentType.html);
+  }
+}
diff --git a/tds/src/integrationTests/java/thredds/server/wms/TestUpdateWmsServer.java b/tds/src/integrationTests/java/thredds/server/wms/TestUpdateWmsServer.java
@@ -20,6 +20,8 @@
 import org.jdom2.input.SAXBuilder;
 import org.jdom2.xpath.XPathExpression;
 import org.jdom2.xpath.XPathFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -29,6 +31,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.lang.invoke.MethodHandles;
+import thredds.server.util.AdminDebugUtils;
 import thredds.test.util.TestOnLocalServer;
 import thredds.util.ContentType;
 
@@ -47,6 +50,17 @@ public class TestUpdateWmsServer {
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder(new File(DIR));
 
+  @BeforeClass
+  public static void disableRafCache() {
+    // Avoid file locks which prevent files from being updated on windows
+    AdminDebugUtils.disableRafCache();
+  }
+
+  @AfterClass
+  public static void enableRafCache() {
+    AdminDebugUtils.enableRafCache();
+  }
+
   @Test
   public void testUpdateFile() throws IOException, JDOMException {
     final String filePath = temporaryFolder.getRoot().getName() + "/" + FILENAME;

diff --git a/tds/src/main/java/thredds/server/admin/DebugCommands.java b/tds/src/main/java/thredds/server/admin/DebugCommands.java
@@ -180,6 +180,14 @@ public void doAction(Event e) {
     };
     debugHandler.addAction(act);
 
+    act = new Action("enableRAFCache", "Enable RandomAccessFile Cache") {
+      public void doAction(Event e) {
+        RandomAccessFile.getGlobalFileCache().enable();
+        e.pw.println("  Enable RandomAccessFile Cache ok");
+      }
+    };
+    debugHandler.addAction(act);
+
     act = new Action("forceRAFCache", "Force clear RandomAccessFile Cache") {
       public void doAction(Event e) {
         RandomAccessFile.getGlobalFileCache().clearCache(true);

diff --git a/tds/src/test/java/thredds/server/wms/TestWmsCache.java b/tds/src/test/java/thredds/server/wms/TestWmsCache.java
@@ -26,6 +26,7 @@
 import java.lang.invoke.MethodHandles;
 import ucar.nc2.dataset.NetcdfDatasets;
 import ucar.nc2.util.cache.FileCacheIF;
+import ucar.unidata.io.RandomAccessFile;
 import ucar.unidata.util.test.category.NeedsCdmUnitTest;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -48,6 +49,23 @@ public class TestWmsCache {
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder(new File(DIR));
 
+  @BeforeClass
+  public static void disableRafCache() {
+    // Avoid file locks which prevent files from being updated on windows
+    final FileCacheIF rafCache = RandomAccessFile.getGlobalFileCache();
+    if (rafCache != null) {
+      rafCache.disable();
+    }
+  }
+
+  @AfterClass
+  public static void enableRafCache() {
+    final FileCacheIF rafCache = RandomAccessFile.getGlobalFileCache();
+    if (rafCache != null) {
+      rafCache.enable();
+    }
+  }
+
   @Before
   public void createTestFiles() throws IOException {
     File tempFile = temporaryFolder.newFile(FILENAME);