Repository: brooklyn-server Updated Branches: refs/heads/0.12.0 784e604fc -> 2e348971b
Add check for test resources Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b2678da4 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b2678da4 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b2678da4 Branch: refs/heads/0.12.0 Commit: b2678da42282ddbdce087a0fe48ad8663979f58d Parents: 784e604 Author: Duncan Godwin <[email protected]> Authored: Tue Sep 19 11:17:48 2017 +0100 Committer: Duncan Godwin <[email protected]> Committed: Tue Sep 19 11:17:48 2017 +0100 ---------------------------------------------------------------------- .../catalog/CatalogOsgiVersionMoreEntityRebindTest.java | 10 +++++++++- .../catalog/CatalogOsgiVersionMoreEntityTest.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b2678da4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java index cb2d2cb..64cd99e 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java @@ -339,6 +339,10 @@ public class CatalogOsgiVersionMoreEntityRebindTest extends AbstractYamlRebindTe @Test public void testClusterWithEntitySpecFromOsgi() throws Exception { + + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_OSGI_ENTITIES_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_PATH); + // install dependencies ((ManagementContextInternal)mgmt()).getOsgiManager().get().install( new ResourceUtils(getClass()).getResourceFromUrl(BROOKLYN_TEST_OSGI_ENTITIES_URL) ).checkNoError(); @@ -356,7 +360,11 @@ public class CatalogOsgiVersionMoreEntityRebindTest extends AbstractYamlRebindTe rebind(); } - protected RegisteredType installWrappedMoreEntity() { + protected RegisteredType installWrappedMoreEntity() throws Exception { + + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_OSGI_ENTITIES_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V2_PATH); + ((ManagementContextInternal)mgmt()).getOsgiManager().get().install( new ResourceUtils(getClass()).getResourceFromUrl(BROOKLYN_TEST_OSGI_ENTITIES_URL) ).checkNoError(); ((ManagementContextInternal)mgmt()).getOsgiManager().get().install( http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b2678da4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java index 10f2454..e1e4b55 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java @@ -71,6 +71,9 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest implement @Test public void testBrooklynManagedBundleInstall() throws Exception { + + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); + OsgiBundleInstallationResult br = ((ManagementContextInternal)mgmt()).getOsgiManager().get().install( new ResourceUtils(getClass()).getResourceFromUrl(BROOKLYN_TEST_MORE_ENTITIES_V1_URL) ).get(); Assert.assertEquals(br.getVersionedName().toString(), BROOKLYN_TEST_MORE_ENTITIES_SYMBOLIC_NAME_FULL+":"+"0.1.0");
