Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 72C20200BD0 for ; Wed, 16 Nov 2016 03:36:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7161B160B05; Wed, 16 Nov 2016 02:36:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BAE13160B03 for ; Wed, 16 Nov 2016 03:36:12 +0100 (CET) Received: (qmail 49038 invoked by uid 500); 16 Nov 2016 02:36:12 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 49029 invoked by uid 99); 16 Nov 2016 02:36:11 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2016 02:36:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 860E21A0880 for ; Wed, 16 Nov 2016 02:36:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id a-jLJddcYkYc for ; Wed, 16 Nov 2016 02:36:09 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 026CB5F5CD for ; Wed, 16 Nov 2016 02:36:09 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 6CA12E035C for ; Wed, 16 Nov 2016 02:35:51 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6AD753A27EE for ; Wed, 16 Nov 2016 02:35:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1769907 - /httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java Date: Wed, 16 Nov 2016 02:35:51 -0000 To: commits@hc.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161116023551.6AD753A27EE@svn01-us-west.apache.org> archived-at: Wed, 16 Nov 2016 02:36:13 -0000 Author: ggregory Date: Wed Nov 16 02:35:51 2016 New Revision: 1769907 URL: http://svn.apache.org/viewvc?rev=1769907&view=rev Log: Tweak test for Java 9 (on Windows at least). Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java?rev=1769907&r1=1769906&r2=1769907&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java Wed Nov 16 02:35:51 2016 @@ -33,6 +33,7 @@ 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.Principal; @@ -584,6 +585,8 @@ public class TestSSLContextBuilder { final boolean isWindows = System.getProperty("os.name").contains("Windows"); if (isWindows && javaVersion < 1.8) { thrown.expect(IOException.class); + } else if (isWindows && javaVersion < 10) { + thrown.expect(SocketException.class); } else { thrown.expect(SSLHandshakeException.class); }