Repository: hadoop Updated Branches: refs/heads/branch-2 016d661ca -> ee07df688
HADOOP-12200. TestCryptoStreamsWithOpensslAesCtrCryptoCodec should be skipped in non-native profile. Contributed by Masatake Iwasaki. (cherry picked from commit 6b7692c468931215ec0de7e11f0bdf15b80e68ce) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ee07df68 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ee07df68 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ee07df68 Branch: refs/heads/branch-2 Commit: ee07df688a9b5fff6c6a329d600651aa41af3904 Parents: 016d661 Author: Akira Ajisaka <[email protected]> Authored: Thu Jul 9 13:14:53 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Thu Jul 9 13:15:37 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../crypto/TestCryptoStreamsWithOpensslAesCtrCryptoCodec.java | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee07df68/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6bb0c08..42a3851 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -462,6 +462,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12117. Potential NPE from Configuration#loadProperty with allowNullValueProperties set. (zhihai xu via vinayakumarb) + HADOOP-12200. TestCryptoStreamsWithOpensslAesCtrCryptoCodec should be + skipped in non-native profile. (Masatake Iwasaki via aajisaka) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee07df68/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsWithOpensslAesCtrCryptoCodec.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsWithOpensslAesCtrCryptoCodec.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsWithOpensslAesCtrCryptoCodec.java index 684ec09..d5f25b8 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsWithOpensslAesCtrCryptoCodec.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsWithOpensslAesCtrCryptoCodec.java @@ -19,16 +19,19 @@ package org.apache.hadoop.crypto; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; +import org.apache.hadoop.util.NativeCodeLoader; import org.junit.BeforeClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assume.assumeTrue; public class TestCryptoStreamsWithOpensslAesCtrCryptoCodec extends TestCryptoStreams { @BeforeClass public static void init() throws Exception { + assumeTrue(NativeCodeLoader.isNativeCodeLoaded()); Configuration conf = new Configuration(); conf.set( CommonConfigurationKeysPublic.HADOOP_SECURITY_CRYPTO_CODEC_CLASSES_AES_CTR_NOPADDING_KEY,
