big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "HADOOP-16321: ITestS3ASSL+TestOpenSSLSocketFactory failing with java.lang.UnsatisfiedLinkErrors"

Browse Source 
This reverts commit 5906268f0d.
This commit is contained in:
Steve Loughran 2019-06-05 12:42:45 +01:00
parent 42cd861be0
commit 7724d8031b
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestOpenSSLSocketFactory.java
View File

@ -35,10 +35,7 @@ public class TestOpenSSLSocketFactory {
@Test @Test
public void testOpenSSL() throws IOException { public void testOpenSSL() throws IOException {
assumeTrue("Unable to load native libraries", assumeTrue(NativeCodeLoader.buildSupportsOpenssl());
NativeCodeLoader.isNativeCodeLoaded());
assumeTrue("Build was not compiled with support for OpenSSL",
NativeCodeLoader.buildSupportsOpenssl());
OpenSSLSocketFactory.initializeDefaultFactory( OpenSSLSocketFactory.initializeDefaultFactory(
OpenSSLSocketFactory.SSLChannelMode.OpenSSL); OpenSSLSocketFactory.SSLChannelMode.OpenSSL);
assertThat(OpenSSLSocketFactory.getDefaultFactory() assertThat(OpenSSLSocketFactory.getDefaultFactory()
@ -47,8 +44,7 @@ public void testOpenSSL() throws IOException {
@Test @Test
public void testJSEEJava8() throws IOException { public void testJSEEJava8() throws IOException {
assumeTrue("Not running on Java 8", assumeTrue(System.getProperty("java.version").startsWith("1.8"));
System.getProperty("java.version").startsWith("1.8"));
OpenSSLSocketFactory.initializeDefaultFactory( OpenSSLSocketFactory.initializeDefaultFactory(
OpenSSLSocketFactory.SSLChannelMode.Default_JSSE); OpenSSLSocketFactory.SSLChannelMode.Default_JSSE);
assertThat(Arrays.stream(OpenSSLSocketFactory.getDefaultFactory() assertThat(Arrays.stream(OpenSSLSocketFactory.getDefaultFactory()

5
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ASSL.java
View File

@ -40,10 +40,7 @@ public class ITestS3ASSL extends AbstractS3ATestBase {
@Test @Test
public void testOpenSSL() throws IOException { public void testOpenSSL() throws IOException {
assumeTrue("Unable to load native libraries", assumeTrue(NativeCodeLoader.buildSupportsOpenssl());
NativeCodeLoader.isNativeCodeLoaded());
assumeTrue("Build was not compiled with support for OpenSSL",
NativeCodeLoader.buildSupportsOpenssl());
Configuration conf = new Configuration(getConfiguration()); Configuration conf = new Configuration(getConfiguration());
conf.setEnum(Constants.SSL_CHANNEL_MODE, conf.setEnum(Constants.SSL_CHANNEL_MODE,
OpenSSLSocketFactory.SSLChannelMode.OpenSSL); OpenSSLSocketFactory.SSLChannelMode.OpenSSL);