Skip to content

Commit 1f41548

Browse files
committed
null check to skip the test and remove non-aws region probe
1 parent 2c541df commit 1f41548

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/third_party_stores.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ then these must be set, either in XML or (preferred) in a JCEKS file.
8282

8383
<property>
8484
<name>fs.s3a.endpoint.region</name>
85-
<value>non-aws</value>
85+
<value>anything</value>
8686
</property>
8787

8888
<property>

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEndpointRegion.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,12 @@ public void testCentralEndpointAndNullRegionFipsWithCRUD() throws Throwable {
518518
}
519519

520520
/**
521-
* Skip the test if the region is sa-east-1.
521+
* Skip the test if the region is null or sa-east-1.
522522
*/
523523
private void skipCrossRegionTest() throws IOException {
524524
String region = getFileSystem().getS3AInternals().getBucketMetadata().bucketRegion();
525-
if (SA_EAST_1.equals(region) || NON_AWS_REGION.equals(region)) {
526-
skip("Skipping test since sa-east-1 or non-aws region is in use");
525+
if (region == null || SA_EAST_1.equals(region)) {
526+
skip("Skipping test since region is null or it is set to sa-east-1");
527527
}
528528
}
529529

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestConstants.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@ public interface S3ATestConstants {
276276
*/
277277
String EU_WEST_1 = "eu-west-1";
278278

279-
/**
280-
* Region name for testing S3A third party stores: {@value}.
281-
*/
282-
String NON_AWS_REGION = "non-aws";
283-
284279
/**
285280
* System property for root tests being enabled: {@value}.
286281
*/

0 commit comments

Comments
 (0)