You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/09/19 11:25:04 UTC
[1/2] brooklyn-server git commit: Add check for test resources
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 <du...@cloudsoftcorp.com>
Authored: Tue Sep 19 11:17:48 2017 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
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");
[2/2] brooklyn-server git commit: This closes #831
Posted by dr...@apache.org.
This closes #831
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2e348971
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2e348971
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2e348971
Branch: refs/heads/0.12.0
Commit: 2e348971b3da459417600bf78e82735d1f105abf
Parents: 784e604 b2678da
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Tue Sep 19 12:22:49 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Tue Sep 19 12:22:49 2017 +0100
----------------------------------------------------------------------
.../catalog/CatalogOsgiVersionMoreEntityRebindTest.java | 10 +++++++++-
.../catalog/CatalogOsgiVersionMoreEntityTest.java | 3 +++
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------