HADOOP-19719. Wildfly Followup: TestDelegatingSSLSocketFactory

Downgrade to a skipped tests if the OS doesn't have GLIBC_2.34. The branch-3.4 version of the patch doesn't delete testJSEENoGCMJava8() and uses classic junit assumeTrue() calls.

Author: steveloughran

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

@@ -25,6 +25,7 @@
 
 import org.apache.hadoop.util.NativeCodeLoader;
 
+import static org.apache.hadoop.test.GenericTestUtils.assertExceptionContains;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
@@ -35,23 +36,30 @@ public class TestDelegatingSSLSocketFactory {
 
  @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());
- DelegatingSSLSocketFactory.initializeDefaultFactory(
- DelegatingSSLSocketFactory.SSLChannelMode.OpenSSL);
- assertThat(DelegatingSSLSocketFactory.getDefaultFactory()
- .getProviderName()).contains("openssl");
+ assumeTrue(NativeCodeLoader.isNativeCodeLoaded(),
+ "Unable to load native libraries");
+ assumeTrue(NativeCodeLoader.buildSupportsOpenssl(),
+ "Build was not compiled with support for OpenSSL");
+ try {
+ DelegatingSSLSocketFactory.initializeDefaultFactory(
+ DelegatingSSLSocketFactory.SSLChannelMode.OpenSSL);
+ assertThat(DelegatingSSLSocketFactory.getDefaultFactory()
+ .getProviderName()).contains("openssl");
+ } catch (IOException e) {
+ // if this is caused by a wildfly version error, downgrade to an assume
+ assertExceptionContains("GLIBC_2.34", e);
+ assumeTrue(false, "wildfly library not compatible with this OS version");
+ }
  }
 
  @Test
  public void testJSEENoGCMJava8() throws IOException {
- assumeTrue("Not running on Java 8",
-  System.getProperty("java.version").startsWith("1.8"));
+ assumeTrue(System.getProperty("java.version").startsWith("1.8"),
+ "Not running on Java 8");
  DelegatingSSLSocketFactory.initializeDefaultFactory(
  DelegatingSSLSocketFactory.SSLChannelMode.Default_JSSE);
  assertThat(Arrays.stream(DelegatingSSLSocketFactory.getDefaultFactory()
  .getSupportedCipherSuites())).noneMatch("GCM"::contains);
  }
+
 }