You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2016/11/24 13:13:59 UTC
[1/2] brooklyn-server git commit: Ignore tests relying on binary
files in the source distribution.
Repository: brooklyn-server
Updated Branches:
refs/heads/master 5eb63b760 -> 870986bd9
Ignore tests relying on binary files in the source distribution.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/95d5ecd8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/95d5ecd8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/95d5ecd8
Branch: refs/heads/master
Commit: 95d5ecd8e9a5ad68df9e3dbee147364df6bae404
Parents: a569463
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Nov 23 23:02:39 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Nov 24 09:15:47 2016 +0200
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/ReferencedYamlTest.java | 12 ++++++++++++
.../camp/brooklyn/catalog/CatalogYamlRebindTest.java | 3 +++
.../XmlMementoSerializerDelegatingClassLoaderTest.java | 3 +++
3 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/95d5ecd8/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
index e67c80f..8775496 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
@@ -218,6 +218,8 @@ public class ReferencedYamlTest extends AbstractYamlTest {
@Test
public void testCatalogReference() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItems(
"brooklyn.catalog:",
" brooklyn.libraries:",
@@ -230,6 +232,8 @@ public class ReferencedYamlTest extends AbstractYamlTest {
@Test
public void testCatalogReferenceByExplicitUrl() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItems(
"brooklyn.catalog:",
" brooklyn.libraries:",
@@ -242,6 +246,8 @@ public class ReferencedYamlTest extends AbstractYamlTest {
@Test
public void testCatalogReferenceByMultipleUrls() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItems(
"brooklyn.catalog:",
" items:",
@@ -254,6 +260,8 @@ public class ReferencedYamlTest extends AbstractYamlTest {
@Test
public void testCatalogReferenceByMultipleUrlsSimplerSyntax() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItems(
"brooklyn.catalog:",
" items:",
@@ -267,6 +275,8 @@ public class ReferencedYamlTest extends AbstractYamlTest {
@Test
public void testCatalogReferenceSeesPreviousItems() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItems(
"brooklyn.catalog:",
" brooklyn.libraries:",
@@ -293,6 +303,8 @@ public class ReferencedYamlTest extends AbstractYamlTest {
@Test
public void testCatalogReferenceMixesMetaAndUrl() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItems(
"brooklyn.catalog:",
" brooklyn.libraries:",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/95d5ecd8/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
index 18bac99..692a45b 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
@@ -56,6 +56,7 @@ import org.apache.brooklyn.core.test.policy.TestEnricher;
import org.apache.brooklyn.core.test.policy.TestPolicy;
import org.apache.brooklyn.entity.stock.BasicEntity;
import org.apache.brooklyn.test.Asserts;
+import org.apache.brooklyn.test.support.TestResourceUnavailableException;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.osgi.OsgiTestResources;
import org.apache.brooklyn.util.text.Strings;
@@ -149,6 +150,8 @@ public class CatalogYamlRebindTest extends AbstractYamlRebindTest {
@Test(dataProvider = "dataProvider")
@SuppressWarnings({ "deprecation", "unused" })
public void testRebindWithCatalogAndApp(RebindWithCatalogTestMode mode, boolean useOsgi) throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
if (mode == RebindWithCatalogTestMode.REPLACE_CATALOG_WITH_NEWER_VERSION) {
BrooklynFeatureEnablement.enable(BrooklynFeatureEnablement.FEATURE_AUTO_FIX_CATALOG_REF_ON_REBIND);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/95d5ecd8/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerDelegatingClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerDelegatingClassLoaderTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerDelegatingClassLoaderTest.java
index deb240a..43b4404 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerDelegatingClassLoaderTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerDelegatingClassLoaderTest.java
@@ -30,6 +30,7 @@ import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest;
import org.apache.brooklyn.core.mgmt.persist.XmlMementoSerializer.OsgiClassLoader;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
+import org.apache.brooklyn.test.support.TestResourceUnavailableException;
import org.apache.brooklyn.util.core.osgi.Osgis;
import org.apache.brooklyn.util.guava.Maybe;
import org.apache.brooklyn.util.osgi.OsgiTestResources;
@@ -59,6 +60,8 @@ public class XmlMementoSerializerDelegatingClassLoaderTest {
@Test
public void testLoadClassFromBundle() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
ClassLoader classLoader = getClass().getClassLoader();
Bundle apiBundle = getBundle(mgmt, "org.apache.brooklyn.api");
Bundle coreBundle = getBundle(mgmt, "org.apache.brooklyn.core");
[2/2] brooklyn-server git commit: This closes #460
Posted by ge...@apache.org.
This closes #460
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/870986bd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/870986bd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/870986bd
Branch: refs/heads/master
Commit: 870986bd96d1fc15d66ca3f249ae86dbc93eafc7
Parents: 5eb63b7 95d5ecd
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Thu Nov 24 13:13:49 2016 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Thu Nov 24 13:13:49 2016 +0000
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/ReferencedYamlTest.java | 12 ++++++++++++
.../camp/brooklyn/catalog/CatalogYamlRebindTest.java | 3 +++
.../XmlMementoSerializerDelegatingClassLoaderTest.java | 3 +++
3 files changed, 18 insertions(+)
----------------------------------------------------------------------