You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2015/06/25 16:23:40 UTC
[07/12] incubator-brooklyn 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/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e91b4cf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e91b4cf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e91b4cf0
Branch: refs/heads/master
Commit: e91b4cf03582252829b837974b9f4c6e0a733e5f
Parents: 6648495
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jun 25 14:55:08 2015 +0100
Committer: Richard Downer <ri...@apache.org>
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/incubator-brooklyn/blob/e91b4cf0/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,