EnricoMi commented on code in PR #8306: URL: https://github.com/apache/hadoop/pull/8306#discussion_r3064299693
########## hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ADeleteNonEmptyDirectoryCapability.java: ########## @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.fs.s3a; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.contract.AbstractContractDeleteTest; +import org.apache.hadoop.fs.contract.AbstractFSContract; +import org.apache.hadoop.fs.contract.s3a.S3AContract; +import org.apache.hadoop.test.tags.IntegrationTest; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.apache.hadoop.fs.s3a.Constants.DELETE_NON_EMPTY_DIRECTORY_ENABLED; +import static org.apache.hadoop.fs.s3a.S3ATestUtils.getTestBucketName; +import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides; + +/** + * Test that fs.s3a.delete.non-empty-directory.enabled is reflected in + * hasPathCapability(DELETE_NON_EMPTY_DIRECTORY_ENABLED). HADOOP-19801. + */ +@IntegrationTest +public class ITestS3ADeleteNonEmptyDirectoryCapability extends + AbstractContractDeleteTest { Review Comment: Class `ITestS3ADeleteNonEmptyDirectoryCapability` extends `AbstractContractDeleteTest`, but `ITestS3AContractDelete` also extends `AbstractContractDeleteTest`, so those abstract tests are executed twice for the S3A filesystem. Either add your capability tests to `ITestS3AContractDelete`, or have `ITestS3ADeleteNonEmptyDirectoryCapability` extends `AbstractFSContractTestBase`. ########## hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ADeleteNonEmptyDirectoryCapability.java: ########## @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.fs.s3a; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.contract.AbstractContractDeleteTest; +import org.apache.hadoop.fs.contract.AbstractFSContract; +import org.apache.hadoop.fs.contract.s3a.S3AContract; +import org.apache.hadoop.test.tags.IntegrationTest; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.apache.hadoop.fs.s3a.Constants.DELETE_NON_EMPTY_DIRECTORY_ENABLED; +import static org.apache.hadoop.fs.s3a.S3ATestUtils.getTestBucketName; +import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides; + +/** + * Test that fs.s3a.delete.non-empty-directory.enabled is reflected in + * hasPathCapability(DELETE_NON_EMPTY_DIRECTORY_ENABLED). HADOOP-19801. + */ +@IntegrationTest +public class ITestS3ADeleteNonEmptyDirectoryCapability extends + AbstractContractDeleteTest { + + @Override + protected AbstractFSContract createContract(Configuration conf) { + return new S3AContract(conf); + } + + /** + * Test that when the option is disabled (default), the capability is false. + */ + @Test + public void testCapabilityDisabledByDefault() throws Throwable { + Assertions.assertThat(getFileSystem().hasPathCapability(new Path("/"), Review Comment: These tests should work with any value for `fs.s3a.delete.non-empty-directory.enabled` set by the user (while testing other integration tests). ```suggestion Configuration conf = new Configuration(getFileSystem().getConf()); removeBaseAndBucketOverrides(getTestBucketName(conf), conf, DELETE_NON_EMPTY_DIRECTORY_ENABLED); disableFilesystemCaching(conf); AbstractFSContract contract = createContract(conf); contract.init(); Assertions.assertThat(contract.getTestFileSystem().hasPathCapability(new Path("/"), ``` This common code should be refactored out into a separate method. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
