Repository: usergrid Updated Branches: refs/heads/master f8e644d60 -> 761aa4410
Add some additional logging around flaky test setup. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/761aa441 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/761aa441 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/761aa441 Branch: refs/heads/master Commit: 761aa44109ab925adfc6763534f96f4d4b8b987a Parents: f8e644d Author: Michael Russo <russomich...@google.com> Authored: Mon Feb 27 18:33:34 2017 -0800 Committer: Michael Russo <russomich...@google.com> Committed: Mon Feb 27 18:33:34 2017 -0800 ---------------------------------------------------------------------- .../test/resource/endpoints/mgmt/OrgResource.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/761aa441/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java index 5e22d4b..8765e37 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java @@ -28,6 +28,7 @@ import org.apache.usergrid.rest.test.resource.state.ClientContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Form; @@ -35,6 +36,8 @@ import javax.ws.rs.core.MediaType; import java.io.IOException; import java.io.StringReader; +import static org.junit.Assert.fail; + //TODO: add error checking to each of the REST calls. /** @@ -101,9 +104,15 @@ public class OrgResource extends NamedResource { public Organization post(Organization organization){ - ApiResponse apiResponse = getTarget( false ).request() - .accept( MediaType.APPLICATION_JSON ) - .post( Entity.json( organization ), ApiResponse.class ); + ApiResponse apiResponse = null; + try { + apiResponse = getTarget(false).request() + .accept(MediaType.APPLICATION_JSON) + .post(Entity.json(organization), ApiResponse.class); + } catch( InternalServerErrorException e){ + logger.error("Unable to create organization, {}", e); + fail("Unable to create organization"); + } Organization org = new Organization(apiResponse);
