Repository: incubator-brooklyn Updated Branches: refs/heads/master 99962a12d -> 80ab770eb
Fix failing test Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fdb73060 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fdb73060 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fdb73060 Branch: refs/heads/master Commit: fdb73060c5060689384f0865c0f17ea7e6e96245 Parents: 4076d3b Author: Svetoslav Neykov <[email protected]> Authored: Mon May 18 22:52:24 2015 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Mon May 18 22:52:24 2015 +0300 ---------------------------------------------------------------------- .../src/test/java/brooklyn/launcher/BrooklynWebServerTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fdb73060/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java index d20ee1a..98b2f2d 100644 --- a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java +++ b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java @@ -29,6 +29,7 @@ import java.security.SecureRandom; import java.util.List; import java.util.Map; +import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLPeerUnverifiedException; import org.apache.http.client.methods.HttpGet; @@ -148,7 +149,9 @@ public class BrooklynWebServerTest { verifyHttpsFromConfig(brooklynProperties); fail("Expected to fail due to unsupported ciphers during connection negotiation"); } catch (Exception e) { - assertTrue(Exceptions.getFirstThrowableOfType(e, SSLPeerUnverifiedException.class) != null, "Expected to fail due to inability to negotiate"); + assertTrue(Exceptions.getFirstThrowableOfType(e, SSLPeerUnverifiedException.class) != null || + Exceptions.getFirstThrowableOfType(e, SSLHandshakeException.class) != null, + "Expected to fail due to inability to negotiate"); } }
