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

This reverts commit 5906268f0dd63a93eb591ddccf70d23b15e5c2ed.

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

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

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

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