You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/31 09:58:04 UTC
[20/50] logging-log4j2 git commit: Allow SslConfigurationTest to pass
when offline and DNS host name lookup fails.
Allow SslConfigurationTest to pass when offline and DNS host name lookup fails.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a76c056b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a76c056b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a76c056b
Branch: refs/heads/master
Commit: a76c056be651e5f0ba1e5e072dd1d24a134d5818
Parents: 7a5f0e6
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 00:31:38 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 00:31:38 2016 +1100
----------------------------------------------------------------------
.../core/net/ssl/SslConfigurationTest.java | 27 +++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a76c056b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
index 6e5773c..e830604 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.net.ssl;
import java.io.IOException;
import java.io.OutputStream;
+import java.net.UnknownHostException;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
@@ -40,9 +41,13 @@ public class SslConfigurationTest {
public void emptyConfigurationHasDefaultTrustStore() throws IOException {
final SslConfiguration sc = SslConfiguration.createSSLConfiguration(null, null, null);
final SSLSocketFactory factory = sc.getSslSocketFactory();
- try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
- Assert.assertNotNull(clientSocket);
- clientSocket.close();
+ try {
+ try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
+ Assert.assertNotNull(clientSocket);
+ clientSocket.close();
+ }
+ } catch (UnknownHostException offline) {
+ // this exception is thrown on Windows when offline
}
}
@@ -51,13 +56,17 @@ public class SslConfigurationTest {
final TrustStoreConfiguration tsc = new TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE, null, null, null);
final SslConfiguration sc = SslConfiguration.createSSLConfiguration(null, null, tsc);
final SSLSocketFactory factory = sc.getSslSocketFactory();
- try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
- try (final OutputStream os = clientSocket.getOutputStream()) {
- os.write("GET config/login_verify2?".getBytes());
- Assert.fail("Expected IOException");
- } catch (final IOException e) {
- // Expected, do nothing.
+ try {
+ try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
+ try (final OutputStream os = clientSocket.getOutputStream()) {
+ os.write("GET config/login_verify2?".getBytes());
+ Assert.fail("Expected IOException");
+ } catch (final IOException e) {
+ // Expected, do nothing.
+ }
}
+ } catch (UnknownHostException offline) {
+ // this exception is thrown on Windows when offline
}
}