diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fdf700a9..4f6c06f8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,7 +2,7 @@ name: Build and test ERDDAP on: push: - branches: [ "main", "gha-test" ] + branches: [ "main" ] pull_request: branches: [ "main" ] diff --git a/src/test/java/gov/noaa/pfel/coastwatch/util/FileVisitorDNLSTests.java b/src/test/java/gov/noaa/pfel/coastwatch/util/FileVisitorDNLSTests.java index 36d45721..6ce4ecad 100644 --- a/src/test/java/gov/noaa/pfel/coastwatch/util/FileVisitorDNLSTests.java +++ b/src/test/java/gov/noaa/pfel/coastwatch/util/FileVisitorDNLSTests.java @@ -14,6 +14,7 @@ import tags.TagAWS; import tags.TagExternalOther; import tags.TagLargeFiles; +import tags.TagMissingDataset; import tags.TagMissingFile; import tags.TagSlowTests; import tags.TagThredds; @@ -979,6 +980,7 @@ void testHyraxMUR() throws Throwable { /** This tests GPCP. */ @org.junit.jupiter.api.Test @TagSlowTests + @TagMissingDataset // Data temporarily unavailable at NCEI due to Hurricane Helene impacts void testGpcp() throws Throwable { String2.log("\n*** FileVisitorDNLS.testGpcp()\n"); diff --git a/src/test/java/gov/noaa/pfel/erddap/handler/TopLevelHandlerTests.java b/src/test/java/gov/noaa/pfel/erddap/handler/TopLevelHandlerTests.java index adfc4f0e..b03bf5de 100644 --- a/src/test/java/gov/noaa/pfel/erddap/handler/TopLevelHandlerTests.java +++ b/src/test/java/gov/noaa/pfel/erddap/handler/TopLevelHandlerTests.java @@ -48,6 +48,7 @@ static void initAll() throws Throwable { context.setDatasetIDSet(new HashSet<>()); context.setDuplicateDatasetIDs(new StringArray()); context.setWarningsFromLoadDatasets(new StringBuilder()); + context.setDatasetsThatFailedToLoadSB(new StringBuilder()); context.settUserHashMap(new HashMap()); context.setMajorLoad(false); context.setErddap(new Erddap()); diff --git a/src/test/java/jetty/JettyTests.java b/src/test/java/jetty/JettyTests.java index 6e8f673a..4b90d13d 100644 --- a/src/test/java/jetty/JettyTests.java +++ b/src/test/java/jetty/JettyTests.java @@ -14378,12 +14378,18 @@ void testEtopoGridFiles(String tDatasetID) throws Throwable { String dapQuery, tName, start, query, results, expected; int po; + String etopoFilePath = EDStatic.getWebInfParentDirectory() + "WEB-INF/ref/etopo1_ice_g_i2.bin"; + long etopoLastModifiedMillis = File2.getLastModified(etopoFilePath); + // get /files/datasetID/.csv results = SSR.getUrlResponseStringNewline( "http://localhost:" + PORT + "/erddap/files/" + tDatasetID + "/.csv"); expected = - "Name,Last modified,Size,Description\n" + "etopo1_ice_g_i2.bin,1642733858000,466624802,\n"; + "Name,Last modified,Size,Description\n" + + "etopo1_ice_g_i2.bin," + + etopoLastModifiedMillis + + ",466624802,\n"; Test.ensureEqual(results, expected, "results=\n" + results); // get /files/datasetID/ @@ -17535,6 +17541,7 @@ void parserAllDatasetsTest() throws Throwable { context.setDatasetsThatFailedToLoadSB(new StringBuilder()); context.setFailedDatasetsWithErrorsSB(new StringBuilder()); context.setWarningsFromLoadDatasets(new StringBuilder()); + context.setDatasetsThatFailedToLoadSB(new StringBuilder()); context.settUserHashMap(new HashMap()); context.setMajorLoad(false); context.setErddap(new Erddap());