Skip to content

Commit

Permalink
Ignore tests failing due to osdc certificate (#1338)
Browse files Browse the repository at this point in the history
  • Loading branch information
tdrwenski committed Apr 30, 2024
1 parent c782ef8 commit f05a148
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 0 deletions.
10 changes: 10 additions & 0 deletions cdm/s3/src/test/java/thredds/filesystem/s3/TestControllerS3.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down Expand Up @@ -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) {
Expand All @@ -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 =
Expand All @@ -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));
Expand Down
3 changes: 3 additions & 0 deletions cdm/s3/src/test/java/thredds/inventory/s3/TestMFileS3.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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};
Expand Down
9 changes: 9 additions & 0 deletions cdm/s3/src/test/java/ucar/unidata/io/s3/TestS3Read.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -325,34 +326,39 @@ 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)) {
testFullReadGoes16S3(ncfile);
}
}

@Ignore("Failing due to expired certificate on OSDC")
@Test
public void osdcFullReadDataset() throws IOException {
try (NetcdfDataset ncd = NetcdfDatasets.openDataset(OSDC_G16_S3_URI)) {
testFullReadGoes16S3(ncd);
}
}

@Ignore("Failing due to expired certificate on OSDC")
@Test
public void osdcPartialReadFile() throws IOException, InvalidRangeException {
try (NetcdfFile ncfile = NetcdfFiles.open(OSDC_G16_S3_URI)) {
testPartialReadGoes16S3(ncfile);
}
}

@Ignore("Failing due to expired certificate on OSDC")
@Test
public void osdcPartialReadDataset() throws IOException, InvalidRangeException {
try (NetcdfDataset ncd = NetcdfDatasets.openDataset(OSDC_G16_S3_URI)) {
testPartialReadGoes16S3(ncd);
}
}

@Ignore("Failing due to expired certificate on OSDC")
@Test
public void osdcPartialReadAquireFile() throws IOException, InvalidRangeException {
DatasetUrl durl = DatasetUrl.findDatasetUrl(OSDC_G16_S3_URI);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions docs/src/test/java/tests/TestDatasetUrlExamples.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f05a148

Please sign in to comment.