From 1204140baa853611582baaaae5905e0466598826 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Tue, 30 Jun 2015 15:04:18 -0700 Subject: [PATCH] HADOOP-12158. Improve error message in TestCryptoStreamsWithOpensslAesCtrCryptoCodec when OpenSSL is not installed. (cherry picked from commit b088bc6c8c36ce3fe8b69bc0280fd4ea80ca6328) --- hadoop-common-project/hadoop-common/CHANGES.txt | 5 +++++ .../TestCryptoStreamsWithOpensslAesCtrCryptoCodec.java | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 31d915d25b9..01a015f32c7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -163,6 +163,11 @@ Release 2.8.0 - UNRELEASED HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error occurs (Jason Lowe via jeagles) + + HADOOP-12158. Improve error message in + TestCryptoStreamsWithOpensslAesCtrCryptoCodec when OpenSSL is not + installed. (wang) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp 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 4f90a0c27fb..684ec097dd7 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,9 +19,11 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; -import org.junit.Assert; import org.junit.BeforeClass; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class TestCryptoStreamsWithOpensslAesCtrCryptoCodec extends TestCryptoStreams { @@ -32,7 +34,10 @@ public static void init() throws Exception { CommonConfigurationKeysPublic.HADOOP_SECURITY_CRYPTO_CODEC_CLASSES_AES_CTR_NOPADDING_KEY, OpensslAesCtrCryptoCodec.class.getName()); codec = CryptoCodec.getInstance(conf); - Assert.assertEquals(OpensslAesCtrCryptoCodec.class.getCanonicalName(), + assertNotNull("Unable to instantiate codec " + + OpensslAesCtrCryptoCodec.class.getName() + ", is the required " + + "version of OpenSSL installed?", codec); + assertEquals(OpensslAesCtrCryptoCodec.class.getCanonicalName(), codec.getClass().getCanonicalName()); } }