Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B87B8200C6B for ; Mon, 27 Mar 2017 17:21:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B722A160B85; Mon, 27 Mar 2017 15:21:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E7062160B99 for ; Mon, 27 Mar 2017 17:21:28 +0200 (CEST) Received: (qmail 78622 invoked by uid 500); 27 Mar 2017 15:21:28 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 78554 invoked by uid 99); 27 Mar 2017 15:21:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Mar 2017 15:21:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06A79DFF7C; Mon, 27 Mar 2017 15:21:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: geomacy@apache.org To: commits@brooklyn.apache.org Date: Mon, 27 Mar 2017 15:21:29 -0000 Message-Id: In-Reply-To: <44181868cf6b4cf380fa0e3d7936d93b@git.apache.org> References: <44181868cf6b4cf380fa0e3d7936d93b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] brooklyn-server git commit: Fix integration tests archived-at: Mon, 27 Mar 2017 15:21:29 -0000 Fix integration tests Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a4242e91 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a4242e91 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a4242e91 Branch: refs/heads/master Commit: a4242e913eed4c2b0750064c2d5339115b132942 Parents: f1d08ee Author: Thomas Bouron Authored: Mon Mar 27 15:06:18 2017 +0100 Committer: Thomas Bouron Committed: Mon Mar 27 15:06:18 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/rest/test/entity/VanillaSoftwareProcessTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a4242e91/rest/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/VanillaSoftwareProcessTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/VanillaSoftwareProcessTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/VanillaSoftwareProcessTest.java index 05d63b9..1265aa6 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/VanillaSoftwareProcessTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/VanillaSoftwareProcessTest.java @@ -81,7 +81,7 @@ public class VanillaSoftwareProcessTest extends BrooklynRestApiLauncherTestFixtu // Add catalogue item. HttpToolResponse response = node.http().post( "/catalog", - ImmutableMap.of(), + ImmutableMap.of("Content-type", "application/yaml"), catalogYaml.getBytes()); HttpAsserts.assertHealthyStatusCode(response.getResponseCode());