You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2019/05/21 17:31:12 UTC

[hadoop] branch trunk updated: HADOOP-16321: ITestS3ASSL+TestOpenSSLSocketFactory failing with java.lang.UnsatisfiedLinkErrors

This is an automated email from the ASF dual-hosted git repository.

mackrorysd 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 5906268  HADOOP-16321: ITestS3ASSL+TestOpenSSLSocketFactory failing with java.lang.UnsatisfiedLinkErrors
5906268 is described below

commit 5906268f0dd63a93eb591ddccf70d23b15e5c2ed
Author: Sahil Takiar <st...@cloudera.com>
AuthorDate: Mon May 20 19:36:44 2019 -0500

    HADOOP-16321: ITestS3ASSL+TestOpenSSLSocketFactory failing with java.lang.UnsatisfiedLinkErrors
---
 .../org/apache/hadoop/security/ssl/TestOpenSSLSocketFactory.java  | 8 ++++++--
 .../src/test/java/org/apache/hadoop/fs/s3a/ITestS3ASSL.java       | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestOpenSSLSocketFactory.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestOpenSSLSocketFactory.java
index ea881e9..41ec3e4 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestOpenSSLSocketFactory.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestOpenSSLSocketFactory.java
@@ -35,7 +35,10 @@ public class TestOpenSSLSocketFactory {
 
   @Test
   public void testOpenSSL() throws IOException {
-    assumeTrue(NativeCodeLoader.buildSupportsOpenssl());
+    assumeTrue("Unable to load native libraries",
+            NativeCodeLoader.isNativeCodeLoaded());
+    assumeTrue("Build was not compiled with support for OpenSSL",
+            NativeCodeLoader.buildSupportsOpenssl());
     OpenSSLSocketFactory.initializeDefaultFactory(
             OpenSSLSocketFactory.SSLChannelMode.OpenSSL);
     assertThat(OpenSSLSocketFactory.getDefaultFactory()
@@ -44,7 +47,8 @@ public class TestOpenSSLSocketFactory {
 
   @Test
   public void testJSEEJava8() throws IOException {
-    assumeTrue(System.getProperty("java.version").startsWith("1.8"));
+    assumeTrue("Not running on Java 8",
+            System.getProperty("java.version").startsWith("1.8"));
     OpenSSLSocketFactory.initializeDefaultFactory(
             OpenSSLSocketFactory.SSLChannelMode.Default_JSSE);
     assertThat(Arrays.stream(OpenSSLSocketFactory.getDefaultFactory()
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ASSL.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ASSL.java
index 794bf80..4232b0f 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ASSL.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ASSL.java
@@ -40,7 +40,10 @@ public class ITestS3ASSL extends AbstractS3ATestBase {
 
   @Test
   public void testOpenSSL() throws IOException {
-    assumeTrue(NativeCodeLoader.buildSupportsOpenssl());
+    assumeTrue("Unable to load native libraries",
+            NativeCodeLoader.isNativeCodeLoaded());
+    assumeTrue("Build was not compiled with support for OpenSSL",
+            NativeCodeLoader.buildSupportsOpenssl());
     Configuration conf = new Configuration(getConfiguration());
     conf.setEnum(Constants.SSL_CHANNEL_MODE,
             OpenSSLSocketFactory.SSLChannelMode.OpenSSL);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org