You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2017/09/06 14:45:32 UTC
httpcomponents-core git commit: HTTPCORE-489: tweak SSL protocol
mismatch test case to work around the problem with intermittent failures on
Windows
Repository: httpcomponents-core
Updated Branches:
refs/heads/master 6e22c52f6 -> 5ea246258
HTTPCORE-489: tweak SSL protocol mismatch test case to work around the problem with intermittent failures on Windows
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/5ea24625
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/5ea24625
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/5ea24625
Branch: refs/heads/master
Commit: 5ea246258b2da559b0645f1ca12cb083948f372e
Parents: 6e22c52
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Wed Sep 6 16:42:50 2017 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Wed Sep 6 16:42:59 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ea24625/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java b/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
index 915b018..219000e 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
@@ -33,7 +33,6 @@ import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
-import java.net.SocketException;
import java.net.URL;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -652,13 +651,9 @@ public class TestSSLContextBuilder {
@Test
public void testSSLHanskshakeProtocolMismatch2() throws Exception {
-
- final double javaVersion = Double.parseDouble(System.getProperty("java.specification.version"));
final boolean isWindows = System.getProperty("os.name").contains("Windows");
- if (isWindows && javaVersion < 1.8) {
+ if (isWindows) {
thrown.expect(IOException.class);
- } else if (isWindows && javaVersion < 10) {
- thrown.expect(SocketException.class);
} else {
thrown.expect(SSLHandshakeException.class);
}