From bdc5e0b955106c0c460ba8cff68528263ee517f2 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Tue, 30 Apr 2024 14:29:35 -0500 Subject: [PATCH] Ignore tests failing due to osdc certificate --- .../java/thredds/filesystem/s3/TestControllerS3.java | 10 ++++++++++ .../test/java/thredds/inventory/s3/TestMFileS3.java | 3 +++ .../src/test/java/ucar/unidata/io/s3/TestS3Read.java | 9 +++++++++ docs/src/test/java/tests/TestDatasetUrlExamples.java | 2 ++ 4 files changed, 24 insertions(+) diff --git a/cdm/s3/src/test/java/thredds/filesystem/s3/TestControllerS3.java b/cdm/s3/src/test/java/thredds/filesystem/s3/TestControllerS3.java index 342cbec4dd..6fbbf6795e 100644 --- a/cdm/s3/src/test/java/thredds/filesystem/s3/TestControllerS3.java +++ b/cdm/s3/src/test/java/thredds/filesystem/s3/TestControllerS3.java @@ -11,6 +11,7 @@ import java.util.Iterator; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; @@ -94,6 +95,7 @@ public void testGetInventoryTopBucketNoDelimiterGcs() throws URISyntaxException checkInventoryTopCountExact(uri, LIMIT_COUNT_MAX); } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetInventoryTopBucketGcsNoDelimiterOsdc() throws URISyntaxException { CdmS3Uri uri = new CdmS3Uri(S3TestsCommon.TOP_LEVEL_OSDC_BUCKET); @@ -114,6 +116,7 @@ public void testGetInventoryTopBucketDelimiterGcs() throws URISyntaxException { checkInventoryTopCountExact(uri, 0); } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetInventoryTopBucketDelimiterOsdc() throws URISyntaxException { CdmS3Uri uri = new CdmS3Uri(S3TestsCommon.TOP_LEVEL_OSDC_BUCKET + DELIMITER_FRAGMENT); @@ -137,6 +140,7 @@ public void testGetInventoryTopBucketAndPrefixSingleMatchGcs() throws URISyntaxE } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetInventoryTopBucketAndPrefixSingleMatchOsdc() throws URISyntaxException { for (String delimiter : DELIMITER_FRAGMENTS) { @@ -164,6 +168,7 @@ public void testGetInventoryTopBucketAndPrefixMultiMatchGcs() throws URISyntaxEx } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetInventoryTopBucketAndPrefixMultiMatchOsdc() throws URISyntaxException { for (String delimiter : DELIMITER_FRAGMENTS) { @@ -192,6 +197,7 @@ public void testGetInventoryAllBucketGcs() throws URISyntaxException { } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetInventoryAllBucketOsdc() throws URISyntaxException { for (String delimiter : DELIMITER_FRAGMENTS) { @@ -216,6 +222,7 @@ public void testGetInventoryAllBucketAndPrefixSingleMatchGcs() throws URISyntaxE } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetInventoryAllBucketAndPrefixSingleMatchOsdc() throws URISyntaxException { for (String delimiter : DELIMITER_FRAGMENTS) { @@ -243,6 +250,7 @@ public void testGetInventoryAllBucketAndPrefixMultiMatchGcs() throws URISyntaxEx } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetInventoryAllBucketAndPrefixMultiMatchOsdc() throws URISyntaxException { for (String delimiter : DELIMITER_FRAGMENTS) { @@ -267,6 +275,7 @@ public void testGetSubdirsWithDelimiterGcs() throws URISyntaxException { checkSubdirsCount(uri, 24); } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetSubdirsWithDelimiterOsdc() throws URISyntaxException { CdmS3Uri uri = @@ -286,6 +295,7 @@ public void testGetSubdirsWithoutDelimiterGcs() throws URISyntaxException { checkSubdirsCount(uri, 0); } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testGetSubdirsWithoutDelimiterOsdc() throws URISyntaxException { CdmS3Uri uri = new CdmS3Uri(S3TestsCommon.TOP_LEVEL_OSDC_BUCKET + "?" + getOsdcKey(G16_KEY_SINGLE_DAY)); diff --git a/cdm/s3/src/test/java/thredds/inventory/s3/TestMFileS3.java b/cdm/s3/src/test/java/thredds/inventory/s3/TestMFileS3.java index f207422266..6b1f75502d 100644 --- a/cdm/s3/src/test/java/thredds/inventory/s3/TestMFileS3.java +++ b/cdm/s3/src/test/java/thredds/inventory/s3/TestMFileS3.java @@ -14,6 +14,7 @@ import java.net.URISyntaxException; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; @@ -113,6 +114,7 @@ public void bucketAndKeyGcs() throws IOException { checkWithBucketAndKey(GCS_G16_S3_OBJECT_1 + DELIMITER_FRAGMENT, G16_NAME_1, "/"); } + @Ignore("Failing due to expired certificate on OSDC") @Test @Category(NotPullRequest.class) public void bucketAndKeyOsdc() throws IOException { @@ -204,6 +206,7 @@ public void s3MFilesAuxInfoOsdc() throws IOException { } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void shouldWriteObjectsToStream() throws IOException { final String[] objects = {AWS_G16_S3_OBJECT_1, GCS_G16_S3_OBJECT_1, OSDC_G16_S3_OBJECT_1}; diff --git a/cdm/s3/src/test/java/ucar/unidata/io/s3/TestS3Read.java b/cdm/s3/src/test/java/ucar/unidata/io/s3/TestS3Read.java index d86419afe4..b3ba7d1be6 100644 --- a/cdm/s3/src/test/java/ucar/unidata/io/s3/TestS3Read.java +++ b/cdm/s3/src/test/java/ucar/unidata/io/s3/TestS3Read.java @@ -16,6 +16,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; @@ -325,6 +326,7 @@ public void gcsPartialReadAquireDataset() throws IOException, InvalidRangeExcept * * @throws IOException Error accessing object store */ + @Ignore("Failing due to expired certificate on OSDC") @Test public void osdcFullReadFile() throws IOException { try (NetcdfFile ncfile = NetcdfFiles.open(OSDC_G16_S3_URI)) { @@ -332,6 +334,7 @@ public void osdcFullReadFile() throws IOException { } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void osdcFullReadDataset() throws IOException { try (NetcdfDataset ncd = NetcdfDatasets.openDataset(OSDC_G16_S3_URI)) { @@ -339,6 +342,7 @@ public void osdcFullReadDataset() throws IOException { } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void osdcPartialReadFile() throws IOException, InvalidRangeException { try (NetcdfFile ncfile = NetcdfFiles.open(OSDC_G16_S3_URI)) { @@ -346,6 +350,7 @@ public void osdcPartialReadFile() throws IOException, InvalidRangeException { } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void osdcPartialReadDataset() throws IOException, InvalidRangeException { try (NetcdfDataset ncd = NetcdfDatasets.openDataset(OSDC_G16_S3_URI)) { @@ -353,6 +358,7 @@ public void osdcPartialReadDataset() throws IOException, InvalidRangeException { } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void osdcPartialReadAquireFile() throws IOException, InvalidRangeException { DatasetUrl durl = DatasetUrl.findDatasetUrl(OSDC_G16_S3_URI); @@ -361,6 +367,7 @@ public void osdcPartialReadAquireFile() throws IOException, InvalidRangeExceptio } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void osdcPartialReadAquireDataset() throws IOException, InvalidRangeException { DatasetUrl durl = DatasetUrl.findDatasetUrl(OSDC_G16_S3_URI); @@ -369,6 +376,7 @@ public void osdcPartialReadAquireDataset() throws IOException, InvalidRangeExcep } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void compareStores() throws IOException { System.setProperty(S3TestsCommon.AWS_REGION_PROP_NAME, S3TestsCommon.AWS_G16_REGION); @@ -385,6 +393,7 @@ public void compareStores() throws IOException { } } + @Ignore("Failing due to expired certificate on OSDC") @Test public void compareAgainstLocal() throws IOException { System.setProperty(S3TestsCommon.AWS_REGION_PROP_NAME, S3TestsCommon.AWS_G16_REGION); diff --git a/docs/src/test/java/tests/TestDatasetUrlExamples.java b/docs/src/test/java/tests/TestDatasetUrlExamples.java index 4f589dd798..7b71121a32 100644 --- a/docs/src/test/java/tests/TestDatasetUrlExamples.java +++ b/docs/src/test/java/tests/TestDatasetUrlExamples.java @@ -8,6 +8,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import ucar.httpservices.Escape; @@ -54,6 +55,7 @@ public void testGcsS3Goes16Example() throws IOException { DatasetUrlExamples.gcsGoes16Example(); } + @Ignore("Failing due to expired certificate on OSDC") @Test public void testOsdcS3Goes16Example() throws IOException { // osdcGoes16Example method uses Google Truth