You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/03/19 15:07:36 UTC
[18/19] incubator-brooklyn git commit: Fix failing tests after
changes to return 403 response code
Fix failing tests after changes to return 403 response code
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a8a27f86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a8a27f86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a8a27f86
Branch: refs/heads/master
Commit: a8a27f86e856ffd5c6f6b39ab15170826d8e9d86
Parents: 884f107
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Mar 6 16:16:57 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Mar 19 16:03:08 2015 +0200
----------------------------------------------------------------------
.../entity/brooklynnode/MockBrooklynNode.java | 2 --
.../BrooklynJavascriptGuiLauncherTest.java | 12 ++++++++--
.../rest/BrooklynRestApiLauncherTest.java | 25 ++++++++++++++++----
.../test/java/brooklyn/rest/HaHotCheckTest.java | 16 ++++++++++++-
4 files changed, 46 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a8a27f86/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java
index c75131e..e20f493 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java
@@ -23,8 +23,6 @@ import java.util.Collection;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.AbstractEntity;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.brooklynnode.BrooklynNode;
-import brooklyn.entity.brooklynnode.EntityHttpClient;
import brooklyn.entity.brooklynnode.CallbackEntityHttpClient.Request;
import brooklyn.entity.brooklynnode.effector.SetHighAvailabilityModeEffectorBody;
import brooklyn.entity.brooklynnode.effector.SetHighAvailabilityPriorityEffectorBody;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a8a27f86/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java b/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
index ca82ee1..ab55d66 100644
--- a/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
+++ b/usage/jsgui/src/test/java/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
@@ -27,6 +27,7 @@ import brooklyn.config.BrooklynServiceAttributes;
import brooklyn.entity.basic.Entities;
import brooklyn.management.ManagementContext;
import brooklyn.rest.BrooklynRestApiLauncherTestFixture;
+import brooklyn.test.Asserts;
import brooklyn.test.HttpTestUtils;
/** Convenience and demo for launching programmatically. */
@@ -60,8 +61,15 @@ public class BrooklynJavascriptGuiLauncherTest {
checkUrlContains("/v1/catalog/entities", "Tomcat");
}
- protected void checkUrlContains(String path, String text) {
- HttpTestUtils.assertContentContainsText(rootUrl()+path, text);
+ protected void checkUrlContains(final String path, final String text) {
+ //Server may return 403 until it loads completely, wait a bit
+ //until it stabilizes.
+ Asserts.succeedsEventually(new Runnable() {
+ @Override
+ public void run() {
+ HttpTestUtils.assertContentContainsText(rootUrl()+path, text);
+ }
+ });
}
protected void checkEventuallyHealthy() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a8a27f86/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncherTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncherTest.java b/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncherTest.java
index da44a69..0412118 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncherTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncherTest.java
@@ -18,12 +18,19 @@
*/
package brooklyn.rest;
-import static brooklyn.rest.BrooklynRestApiLauncher.StartMode.*;
+import static brooklyn.rest.BrooklynRestApiLauncher.StartMode.FILTER;
+import static brooklyn.rest.BrooklynRestApiLauncher.StartMode.SERVLET;
+import static brooklyn.rest.BrooklynRestApiLauncher.StartMode.WEB_XML;
+
+import java.util.concurrent.Callable;
+
+import org.apache.http.HttpStatus;
import org.eclipse.jetty.server.Server;
import org.testng.annotations.Test;
import brooklyn.rest.security.provider.AnyoneSecurityProvider;
import brooklyn.rest.util.BrooklynRestResourceUtilsTest.SampleNoOpApplication;
+import brooklyn.test.Asserts;
import brooklyn.test.HttpTestUtils;
public class BrooklynRestApiLauncherTest extends BrooklynRestApiLauncherTestFixture {
@@ -50,9 +57,19 @@ public class BrooklynRestApiLauncherTest extends BrooklynRestApiLauncherTestFixt
}
private static void checkRestCatalogApplications(Server server) throws Exception {
- String rootUrl = "http://localhost:"+server.getConnectors()[0].getLocalPort();
- HttpTestUtils.assertHealthyStatusCode(
- HttpTestUtils.getHttpStatusCode(rootUrl+"/v1/catalog/applications"));
+ final String rootUrl = "http://localhost:"+server.getConnectors()[0].getLocalPort();
+ int code = Asserts.succeedsEventually(new Callable<Integer>() {
+ @Override
+ public Integer call() throws Exception {
+ int code = HttpTestUtils.getHttpStatusCode(rootUrl+"/v1/catalog/applications");
+ if (code == HttpStatus.SC_FORBIDDEN) {
+ throw new RuntimeException("Retry request");
+ } else {
+ return code;
+ }
+ }
+ });
+ HttpTestUtils.assertHealthyStatusCode(code);
HttpTestUtils.assertContentContainsText(rootUrl+"/v1/catalog/applications", SampleNoOpApplication.class.getSimpleName());
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a8a27f86/usage/rest-server/src/test/java/brooklyn/rest/HaHotCheckTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/HaHotCheckTest.java b/usage/rest-server/src/test/java/brooklyn/rest/HaHotCheckTest.java
index 8692325..8f28728 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/HaHotCheckTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/HaHotCheckTest.java
@@ -22,6 +22,9 @@ import static org.testng.Assert.assertEquals;
import javax.ws.rs.core.MediaType;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -43,13 +46,24 @@ public class HaHotCheckTest extends BrooklynRestResourceTest {
private ManagementContextMock mgmtMock;
- @Override
+ //Treat before/after class methods as before/after method
+ //otherwise they should be static.
+ @BeforeClass(alwaysRun=true)
+ public void setUpClass() {}
+ @AfterClass(alwaysRun=true)
+ public void tearDownClass() {}
+
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception {
mgmtMock = new ManagementContextMock();
super.setUp();
}
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
@Override
protected void addBrooklynResources() {
config.getSingletons().add(new ManagementContextProvider(mgmtMock));