Repository: brooklyn-server Updated Branches: refs/heads/master 85e1e7279 -> 7a4ca1c1f
Updates `verifyHttpsCiphers` test Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9a2491af Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9a2491af Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9a2491af Branch: refs/heads/master Commit: 9a2491aff4ea156794537a3d925993d087cee8d4 Parents: 4496447 Author: Mark McKenna <[email protected]> Authored: Fri Jul 21 12:56:34 2017 +0100 Committer: Mark McKenna <[email protected]> Committed: Fri Aug 18 16:17:36 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9a2491af/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java index e1eb1b3..b1190db 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java @@ -32,6 +32,7 @@ import java.security.SecureRandom; import java.util.List; import java.util.Map; +import javax.net.ssl.SSLException; import javax.net.ssl.SSLHandshakeException; import org.apache.brooklyn.core.entity.Entities; @@ -201,6 +202,7 @@ public class BrooklynWebServerTest { // which provides the opportunity for the server to interweave between those and close the // socket before the client calls startHandshake(), or maybe miss it assertTrue((Exceptions.getFirstThrowableOfType(e, SocketException.class) != null) + || (Exceptions.getFirstThrowableOfType(e, SSLException.class) != null) || (Exceptions.getFirstThrowableOfType(e, SSLHandshakeException.class) != null), "Expected to fail due to inability to negotiate"); }
