You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/05/19 10:48:08 UTC
[1/2] incubator-brooklyn git commit: Fix failing test
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 <sv...@cloudsoftcorp.com>
Authored: Mon May 18 22:52:24 2015 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
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");
}
}
[2/2] incubator-brooklyn git commit: This closes #649
Posted by he...@apache.org.
This closes #649
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/80ab770e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/80ab770e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/80ab770e
Branch: refs/heads/master
Commit: 80ab770eb43e2bb5094537686f54cd3af24d2938
Parents: 99962a1 fdb7306
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue May 19 09:47:59 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue May 19 09:47:59 2015 +0100
----------------------------------------------------------------------
.../src/test/java/brooklyn/launcher/BrooklynWebServerTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------