Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AC203183E4 for ; Mon, 1 Feb 2016 17:50:21 +0000 (UTC) Received: (qmail 64052 invoked by uid 500); 1 Feb 2016 17:49:59 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 63859 invoked by uid 500); 1 Feb 2016 17:49:59 -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 63320 invoked by uid 99); 1 Feb 2016 17:49:59 -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, 01 Feb 2016 17:49:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31E09DFE61; Mon, 1 Feb 2016 17:49:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 01 Feb 2016 17:50:22 -0000 Message-Id: In-Reply-To: <76bebd5deb154ca6a9ba1f0b9d736175@git.apache.org> References: <76bebd5deb154ca6a9ba1f0b9d736175@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/50] [abbrv] brooklyn-server git commit: Add another test resource check for the source release Add another test resource check for the source release Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/edae75a7 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/edae75a7 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/edae75a7 Branch: refs/heads/0.7.0-incubating Commit: edae75a794d54e1e277f6499ffc4636814db5262 Parents: 6f356e7 Author: Richard Downer Authored: Thu Jun 25 14:55:08 2015 +0100 Committer: Richard Downer Committed: Thu Jun 25 15:22:12 2015 +0100 ---------------------------------------------------------------------- .../java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/edae75a7/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java index 78cebd2..6863c4c 100644 --- a/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java +++ b/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java @@ -198,13 +198,15 @@ public class OsgiVersionMoreEntityTest { } public static CatalogItem addMoreEntityV1(ManagementContext mgmt, String versionToRegister) { - return addCatalogItemWithNameAndType(mgmt, + TestResourceUnavailableException.throwIfResourceUnavailable(OsgiVersionMoreEntityTest.class, BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + return addCatalogItemWithNameAndType(mgmt, OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, versionToRegister, OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, BROOKLYN_TEST_MORE_ENTITIES_V1_URL); } public static CatalogItem addMoreEntityV2(ManagementContext mgmt, String versionToRegister) { + TestResourceUnavailableException.throwIfResourceUnavailable(OsgiVersionMoreEntityTest.class, BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); return addCatalogItemWithNameAndType(mgmt, OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_MORE_ENTITY, versionToRegister,