This is an automated email from the ASF dual-hosted git repository. stevel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new 7ec762a5fd5 HADOOP-18465. Fix S3A SSE test skip when encryption is disabled (#4925) 7ec762a5fd5 is described below commit 7ec762a5fd5e319b73224fa1b2a0d353aecd77dd Author: Daniel Carl Jones <djone...@amazon.com> AuthorDate: Thu Oct 6 12:42:01 2022 +0100 HADOOP-18465. Fix S3A SSE test skip when encryption is disabled (#4925) Contributed by Daniel Carl Jones --- .../org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java index 23776f3164f..6df4f7593c9 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java @@ -78,8 +78,16 @@ public abstract class AbstractTestS3AEncryption extends AbstractS3ATestBase { 0, 1, 2, 3, 4, 5, 254, 255, 256, 257, 2 ^ 12 - 1 }; + /** + * Skips the tests if encryption is not enabled in configuration. + * + * @implNote We can use {@link #createConfiguration()} here since + * it does not depend on any per-bucket based configuration. + * Otherwise, we would need to grab the configuration from an + * instance of {@link S3AFileSystem}. + */ protected void requireEncryptedFileSystem() { - skipIfEncryptionTestsDisabled(getFileSystem().getConf()); + skipIfEncryptionTestsDisabled(createConfiguration()); } /** @@ -91,8 +99,8 @@ public abstract class AbstractTestS3AEncryption extends AbstractS3ATestBase { @Override public void setup() throws Exception { try { - super.setup(); requireEncryptedFileSystem(); + super.setup(); } catch (AccessDeniedException e) { skip("Bucket does not allow " + getSSEAlgorithm() + " encryption method"); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org