You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/11/04 16:41:43 UTC
[1/3] brooklyn-server git commit: Create a new management context for
rebind test
Repository: brooklyn-server
Updated Branches:
refs/heads/master 01140cd23 -> 59cbcc593
Create a new management context for rebind test
The tests in RebindManagerExceptionHandlerTest were reusing the same management context on rebind - create a new management context instead to make sure we are rebinding against the on-disk persisted state.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/adb0173a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/adb0173a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/adb0173a
Branch: refs/heads/master
Commit: adb0173a73a36e9186b972de26e0ba03ad78e6a5
Parents: c4cc0d1
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Nov 3 09:48:13 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Nov 3 09:48:13 2016 +0200
----------------------------------------------------------------------
.../AbstractJcloudsRebindStubYamlTest.java | 5 +-
.../brooklyn/camp/brooklyn/RebindOsgiTest.java | 5 +-
.../core/mgmt/rebind/RebindCatalogItemTest.java | 3 +-
...talogWhenCatalogPersistenceDisabledTest.java | 22 ++------
.../RebindManagerExceptionHandlerTest.java | 55 ++++----------------
.../core/mgmt/rebind/RebindOptions.java | 8 ++-
.../core/mgmt/rebind/RebindTestFixture.java | 23 ++++----
...ClockerDynamicLocationPatternRebindTest.java | 4 +-
8 files changed, 46 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsRebindStubYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsRebindStubYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsRebindStubYamlTest.java
index d12b885..f273db7 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsRebindStubYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsRebindStubYamlTest.java
@@ -19,6 +19,7 @@
package org.apache.brooklyn.camp.brooklyn;
import java.io.File;
+import java.util.Map;
import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode;
import org.apache.brooklyn.camp.brooklyn.AbstractJcloudsStubYamlTest.ByonComputeServiceStaticRef;
@@ -91,11 +92,11 @@ public abstract class AbstractJcloudsRebindStubYamlTest extends JcloudsRebindStu
}
@Override
- protected LocalManagementContext createNewManagementContext(final File mementoDir, final HighAvailabilityMode haMode) {
+ protected LocalManagementContext createNewManagementContext(final File mementoDir, final HighAvailabilityMode haMode, final Map<?, ?> additionalProperties) {
newLauncher = new BrooklynCampPlatformLauncherNoServer() {
@Override
protected LocalManagementContext newMgmtContext() {
- return AbstractJcloudsRebindStubYamlTest.super.createNewManagementContext(mementoDir, haMode);
+ return AbstractJcloudsRebindStubYamlTest.super.createNewManagementContext(mementoDir, haMode, additionalProperties);
}
};
newLauncher.launch();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java
index 5d7bd0f..fe071a5 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java
@@ -25,6 +25,7 @@ import static org.testng.Assert.assertNull;
import java.io.File;
import java.util.List;
+import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.mgmt.ManagementContext;
@@ -91,8 +92,8 @@ public class RebindOsgiTest extends AbstractYamlRebindTest {
}
@Override
- protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode) {
- LocalManagementContext result = super.createNewManagementContext(mementoDir, haMode);
+ protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode, Map<?, ?> additionalProperties) {
+ LocalManagementContext result = super.createNewManagementContext(mementoDir, haMode, additionalProperties);
for (String bundleUrl : bundleUrlsToInstallOnRebind) {
try {
installBundle(result, bundleUrl);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java
index 624e733..6fbffdd 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java
@@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.io.File;
+import java.util.Map;
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType;
@@ -93,7 +94,7 @@ public class RebindCatalogItemTest extends RebindTestFixtureWithApp {
}
@Override
- protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode) {
+ protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode, Map<?, ?> additionalProperties) {
BrooklynProperties properties = BrooklynProperties.Factory.newDefault();
properties.put(BrooklynServerConfig.BROOKLYN_CATALOG_URL, "classpath://brooklyn/entity/rebind/rebind-catalog-item-test-catalog.xml");
return RebindTestUtils.managementContextBuilder(mementoDir, classLoader)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
index 70d5a16..902770d 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java
@@ -21,6 +21,7 @@ package org.apache.brooklyn.core.mgmt.rebind;
import static org.testng.Assert.assertEquals;
import java.io.File;
+import java.util.Map;
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.EntitySpec;
@@ -58,25 +59,10 @@ public class RebindCatalogWhenCatalogPersistenceDisabledTest extends RebindTestF
}
@Override
- protected LocalManagementContext createOrigManagementContext() {
- BrooklynProperties properties = BrooklynProperties.Factory.newDefault();
+ protected BrooklynProperties createBrooklynProperties() {
+ BrooklynProperties properties = super.createBrooklynProperties();
properties.put(BrooklynServerConfig.BROOKLYN_CATALOG_URL, TEST_CATALOG);
- return RebindTestUtils.managementContextBuilder(mementoDir, classLoader)
- .properties(properties)
- .persistPeriodMillis(getPersistPeriodMillis())
- .forLive(useLiveManagementContext())
- .buildStarted();
- }
-
- @Override
- protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode) {
- BrooklynProperties properties = BrooklynProperties.Factory.newDefault();
- properties.put(BrooklynServerConfig.BROOKLYN_CATALOG_URL, TEST_CATALOG);
- return RebindTestUtils.managementContextBuilder(mementoDir, classLoader)
- .properties(properties)
- .forLive(useLiveManagementContext())
- .haMode(haMode)
- .buildUnstarted();
+ return properties;
}
@Test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerExceptionHandlerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerExceptionHandlerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerExceptionHandlerTest.java
index 14b2a16..33583fa 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerExceptionHandlerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerExceptionHandlerTest.java
@@ -19,12 +19,8 @@
package org.apache.brooklyn.core.mgmt.rebind;
import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.entity.EntityAsserts;
-import org.apache.brooklyn.core.internal.BrooklynProperties;
-import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.test.entity.TestApplication;
-import org.apache.brooklyn.core.test.entity.TestApplicationNoEnrichersImpl;
import org.apache.brooklyn.core.test.entity.TestEntity;
import org.apache.brooklyn.test.Asserts;
import org.testng.annotations.Test;
@@ -33,19 +29,20 @@ import com.google.common.collect.ImmutableMap;
public class RebindManagerExceptionHandlerTest extends RebindTestFixtureWithApp {
- @Test
- public void testAddConfigFailure() throws Throwable {
- origApp.createAndManageChild(EntitySpec.create(TestEntity.class)
+ @Override
+ protected TestApplication createApp() {
+ TestApplication app = super.createApp();
+ app.createAndManageChild(EntitySpec.create(TestEntity.class)
.configure(TestEntity.CONF_MAP_THING.getName(),
+ // misconfigured map value, should be a string key, but forced (by using a flag) so failure won't be enforced until persist/rebind
ImmutableMap.of("keyWithMapValue", ImmutableMap.of("minRam", 4))));
- // above misconfigured, should be a string key, but forced above so failure won't be enforced until persist/rebind
+ return app;
+ }
+ @Test
+ public void testAddConfigFailure() throws Throwable {
try {
- RebindTestUtils.waitForPersisted(origApp);
- RebindOptions rebindOptions = RebindOptions.create();
- // Use the original context with empty properties so the test doesn't depend on the local properties file
- rebindOptions.newManagementContext = origManagementContext;
- rebind(rebindOptions);
+ rebind();
Asserts.shouldHaveFailedPreviously();
} catch (Throwable e) {
Asserts.expectedFailureContainsIgnoreCase(e, "minRam=4", "keyWithMapValue");
@@ -54,39 +51,9 @@ public class RebindManagerExceptionHandlerTest extends RebindTestFixtureWithApp
@Test
public void testAddConfigContinue() throws Throwable {
- ManagementContext m = createManagementContextWithAddConfigContinue();
- // configured above to continue on error
-
- origApp = m.getEntityManager().createEntity(EntitySpec.create(TestApplication.class, TestApplicationNoEnrichersImpl.class));
- origApp.createAndManageChild(EntitySpec.create(TestEntity.class)
- .configure(TestEntity.CONF_MAP_THING.getName(),
- ImmutableMap.of("keyWithMapValue", ImmutableMap.of("minRam", 4))));
-
- RebindTestUtils.waitForPersisted(origApp);
- RebindOptions rebindOptions = RebindOptions.create();
- rebindOptions.newManagementContext = m;
+ RebindOptions rebindOptions = RebindOptions.create().additionalProperties(ImmutableMap.of("rebind.failureMode.addConfig", "continue"));
TestApplication rebindedApp = rebind(rebindOptions);
EntityAsserts.assertConfigEquals(rebindedApp, TestEntity.CONF_MAP_THING, null);
}
- private LocalManagementContext createManagementContextWithAddConfigContinue() {
- BrooklynProperties bp = BrooklynProperties.Factory.newEmpty();
- bp.putIfAbsent("rebind.failureMode.addConfig", "continue");
- return RebindTestUtils.managementContextBuilder(mementoDir, classLoader)
- .properties(bp)
- .persistPeriodMillis(getPersistPeriodMillis())
- .forLive(useLiveManagementContext())
- .emptyCatalog(useEmptyCatalog())
- .buildStarted();
- }
-
- @Override
- protected LocalManagementContext createOrigManagementContext() {
- return RebindTestUtils.managementContextBuilder(mementoDir, classLoader)
- .properties(BrooklynProperties.Factory.newEmpty())
- .persistPeriodMillis(getPersistPeriodMillis())
- .forLive(useLiveManagementContext())
- .emptyCatalog(useEmptyCatalog())
- .buildStarted();
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindOptions.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindOptions.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindOptions.java
index eab61cf..e3c32db 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindOptions.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindOptions.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.core.mgmt.rebind;
import java.io.File;
import java.util.Collection;
+import java.util.Map;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.mgmt.ManagementContext;
@@ -46,6 +47,7 @@ public class RebindOptions {
public PersistenceObjectStore objectStore;
public HighAvailabilityMode haMode;
public Function<Collection<Application>, Application> applicationChooserOnRebind;
+ public Map<?, ?> additionalProperties;
public static RebindOptions create() {
return new RebindOptions();
@@ -64,6 +66,7 @@ public class RebindOptions {
result.objectStore(options.objectStore);
result.haMode(options.haMode);
result.applicationChooserOnRebind(options.applicationChooserOnRebind);
+ result.additionalProperties(options.additionalProperties);
return result;
}
public RebindOptions checkSerializable(boolean val) {
@@ -110,9 +113,12 @@ public class RebindOptions {
this.haMode = val;
return this;
}
-
public RebindOptions applicationChooserOnRebind(Function<Collection<Application>, Application> val) {
this.applicationChooserOnRebind = val;
return this;
}
+ public RebindOptions additionalProperties(Map<?, ?> additionalProperties) {
+ this.additionalProperties = additionalProperties;
+ return this;
+ }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
index 5ed62c1..7109b02 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
@@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals;
import java.io.File;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -121,21 +122,25 @@ public abstract class RebindTestFixture<T extends StartableApplication> {
/** As {@link #createNewManagementContext(File)} using the default memento dir */
protected LocalManagementContext createNewManagementContext() {
- return createNewManagementContext(mementoDir);
+ return createNewManagementContext(mementoDir, null);
}
/** @return An unstarted management context using the specified mementoDir (or default if null) */
- protected LocalManagementContext createNewManagementContext(File mementoDir) {
- return createNewManagementContext(mementoDir, getHaMode());
+ protected LocalManagementContext createNewManagementContext(File mementoDir, Map<?, ?> additionalProperties) {
+ return createNewManagementContext(mementoDir, getHaMode(), additionalProperties);
}
-
- protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode) {
+
+ protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode, Map<?, ?> additionalProperties) {
if (mementoDir==null) mementoDir = this.mementoDir;
+ BrooklynProperties brooklynProperties = createBrooklynProperties();
+ if (additionalProperties != null) {
+ brooklynProperties.addFrom(additionalProperties);
+ }
return RebindTestUtils.managementContextBuilder(mementoDir, classLoader)
.forLive(useLiveManagementContext())
.haMode(haMode)
.emptyCatalog(useEmptyCatalog())
- .properties(createBrooklynProperties())
+ .properties(brooklynProperties)
.enableOsgi(useOsgi())
.buildUnstarted();
}
@@ -287,7 +292,7 @@ public abstract class RebindTestFixture<T extends StartableApplication> {
if (options.classLoader == null) options.classLoader(classLoader);
if (options.mementoDir == null) options.mementoDir(mementoDir);
if (options.origManagementContext == null) options.origManagementContext(origManagementContext);
- if (options.newManagementContext == null) options.newManagementContext(createNewManagementContext(options.mementoDir));
+ if (options.newManagementContext == null) options.newManagementContext(createNewManagementContext(options.mementoDir, options.additionalProperties));
RebindTestUtils.waitForPersisted(origApp);
@@ -318,9 +323,9 @@ public abstract class RebindTestFixture<T extends StartableApplication> {
if (options.classLoader == null) options.classLoader(classLoader);
if (options.mementoDir == null) options.mementoDir(mementoDir);
if (options.origManagementContext == null) options.origManagementContext(origManagementContext);
- if (options.newManagementContext == null) options.newManagementContext(createNewManagementContext(options.mementoDir, options.haMode));
+ if (options.newManagementContext == null) options.newManagementContext(createNewManagementContext(options.mementoDir, options.haMode, options.additionalProperties));
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
newManagementContext = options.newManagementContext;
newApp = (T) RebindTestUtils.rebind(options);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/adb0173a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternRebindTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternRebindTest.java b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternRebindTest.java
index 288bd5e..b190f0c 100644
--- a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternRebindTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternRebindTest.java
@@ -57,8 +57,8 @@ public class ClockerDynamicLocationPatternRebindTest extends RebindTestFixtureWi
}
@Override
- protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode) {
- LocalManagementContext result = super.createNewManagementContext(mementoDir, haMode);
+ protected LocalManagementContext createNewManagementContext(File mementoDir, HighAvailabilityMode haMode, Map<?, ?> additionalProperties) {
+ LocalManagementContext result = super.createNewManagementContext(mementoDir, haMode, additionalProperties);
StubResolver stubResolver = new StubResolver();
((BasicLocationRegistry)result.getLocationRegistry()).registerResolver(stubResolver);
return result;
[2/3] brooklyn-server git commit: Stop persitence before rebind
attempt
Posted by al...@apache.org.
Stop persitence before rebind attempt
This is an attempt to fix test failures on the Apache Jenkins Windows slaves. The tests would frequrently fail with "The process cannot access the file because it is being used by another process" when trying to read the persisted state. Persistence in the old management context wasn't being stopped before trying the rebind so there's a chance that it would try to overwrite the files while the new management context rebinds, leading to file locking errors. Stopping persistence before rebind should solve the locking failures.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ca9a7c9e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ca9a7c9e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ca9a7c9e
Branch: refs/heads/master
Commit: ca9a7c9e425f888d76ef556a2c2c432a8672b8af
Parents: adb0173
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Nov 3 09:52:10 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Nov 3 09:52:10 2016 +0200
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/DslAndRebindYamlTest.java | 2 +-
.../JavaWebAppWithDslYamlRebindIntegrationTest.java | 2 +-
.../core/mgmt/rebind/RebindCatalogEntityTest.java | 2 +-
.../mgmt/rebind/RebindEntityDynamicTypeInfoTest.java | 2 +-
.../brooklyn/core/mgmt/rebind/RebindEntityTest.java | 4 ++--
.../brooklyn/core/mgmt/rebind/RebindLocationTest.java | 4 ++--
.../brooklyn/core/mgmt/rebind/RebindPolicyTest.java | 4 ++--
.../brooklyn/core/mgmt/rebind/RebindTestFixture.java | 2 +-
.../brooklyn/core/mgmt/rebind/RebindTestUtils.java | 11 +++++++++++
.../mgmt/rebind/transformer/CompoundTransformerTest.java | 4 +++-
.../FixedListMachineProvisioningLocationRebindTest.java | 2 +-
.../brooklyn/location/multi/MultiLocationRebindTest.java | 2 +-
.../launcher/blueprints/AbstractBlueprintTest.java | 2 +-
.../JcloudsByonLocationResolverStubbedRebindTest.java | 2 +-
.../location/jclouds/RebindJcloudsLocationLiveTest.java | 8 +++-----
15 files changed, 32 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
index 14a3daa..a1147db 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
@@ -106,7 +106,7 @@ public class DslAndRebindYamlTest extends AbstractYamlTest {
}
protected Application rebind(Application app) throws Exception {
- RebindTestUtils.waitForPersisted(app);
+ RebindTestUtils.stopPersistence(app);
Application result = RebindTestUtils.rebind(mementoDir, getClass().getClassLoader());
mgmtContexts.add(result.getManagementContext());
return result;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java
index f379556..1b1d876 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java
@@ -82,7 +82,7 @@ public class JavaWebAppWithDslYamlRebindIntegrationTest extends AbstractYamlTest
}
public Application rebind(Application app) throws Exception {
- RebindTestUtils.waitForPersisted(app);
+ RebindTestUtils.stopPersistence(app);
// optionally for good measure can also check this:
// RebindTestUtils.checkCurrentMementoSerializable(app);
Application result = RebindTestUtils.rebind(mementoDir, getClass().getClassLoader());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java
index 5cfa97a..ac53283 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java
@@ -125,7 +125,7 @@ public class RebindCatalogEntityTest extends RebindTestFixture<StartableApplicat
// because that won't have right catalog classpath.
// How to reuse that code cleanly?
protected StartableApplication rebindWithAppClass() throws Exception {
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
LocalManagementContext newManagementContext = RebindTestUtils.newPersistingManagementContextUnstarted(mementoDir, classLoader);
UrlClassLoader ucl = new UrlClassLoader(url);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityDynamicTypeInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityDynamicTypeInfoTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityDynamicTypeInfoTest.java
index 8f3a795..102c63b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityDynamicTypeInfoTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityDynamicTypeInfoTest.java
@@ -75,7 +75,7 @@ public class RebindEntityDynamicTypeInfoTest extends RebindTestFixtureWithApp {
// dynamic effector
origApp.getMutableEntityType().addEffector(SayHiBody.EFFECTOR);
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
File mementoFile = new File(new File(mementoDir, "entities"), origApp.getId());
String memento = Streams.readFullyAndClose(new FileReader(mementoFile));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
index 62aed5e..a918e64 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
@@ -370,7 +370,7 @@ public class RebindEntityTest extends RebindTestFixtureWithApp {
MyLatchingEntityImpl.latching = true;
// Serialize and rebind, but don't yet manage the app
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
RebindTestUtils.checkCurrentMementoSerializable(origApp);
newManagementContext = RebindTestUtils.newPersistingManagementContextUnstarted(mementoDir, classLoader);
Thread thread = new Thread() {
@@ -421,7 +421,7 @@ public class RebindEntityTest extends RebindTestFixtureWithApp {
MyLatchingEntityImpl.latching = true;
// Serialize and rebind, but don't yet manage the app
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
RebindTestUtils.checkCurrentMementoSerializable(origApp);
newManagementContext = new LocalManagementContext();
Thread thread = new Thread() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
index 7d13672..327dd96 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
@@ -177,7 +177,7 @@ public class RebindLocationTest extends RebindTestFixtureWithApp {
MyLocation.myStaticFieldNotSetFromFlag = "myval";
origApp.start(ImmutableList.of(origLoc));
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
MyLocation.myStaticFieldNotSetFromFlag = "mynewval";
newApp = (TestApplication) RebindTestUtils.rebind(mementoDir, getClass().getClassLoader());
MyLocation newLoc = (MyLocation) Iterables.get(newApp.getLocations(), 0);
@@ -192,7 +192,7 @@ public class RebindLocationTest extends RebindTestFixtureWithApp {
MyLocation origLoc = new MyLocation(MutableMap.of("myStaticFieldSetFromFlag", "myval"));
origApp.start(ImmutableList.of(origLoc));
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
MyLocation.myStaticFieldSetFromFlag = "mynewval"; // not auto-checkpointed
newApp = (TestApplication) RebindTestUtils.rebind(mementoDir, getClass().getClassLoader());
MyLocation newLoc = (MyLocation) Iterables.get(newApp.getLocations(), 0);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java
index 4ce7efe..1ddec1d 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java
@@ -137,7 +137,7 @@ public class RebindPolicyTest extends RebindTestFixtureWithApp {
Entities.unmanage(entity);
Locations.unmanage(loc);
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
BrooklynMementoManifest manifest = loadMementoManifest();
assertFalse(manifest.getEntityIdToManifest().containsKey(entity.getId()));
@@ -156,7 +156,7 @@ public class RebindPolicyTest extends RebindTestFixtureWithApp {
entity.policies().remove(policy);
entity.enrichers().remove(enricher);
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
BrooklynMementoManifest manifest = loadMementoManifest();
assertFalse(manifest.getPolicyIdToType().containsKey(policy.getId()));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
index 7109b02..0e2c9fb 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
@@ -294,7 +294,7 @@ public abstract class RebindTestFixture<T extends StartableApplication> {
if (options.origManagementContext == null) options.origManagementContext(origManagementContext);
if (options.newManagementContext == null) options.newManagementContext(createNewManagementContext(options.mementoDir, options.additionalProperties));
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
newManagementContext = options.newManagementContext;
newApp = (T) RebindTestUtils.rebind(options);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
index 2283b66..1d0f236 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
@@ -34,6 +34,7 @@ import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode;
import org.apache.brooklyn.api.mgmt.ha.ManagementNodeState;
import org.apache.brooklyn.api.mgmt.rebind.RebindExceptionHandler;
+import org.apache.brooklyn.api.mgmt.rebind.RebindManager;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMemento;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoPersister;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoRawData;
@@ -467,6 +468,16 @@ public class RebindTestUtils {
managementContext.getRebindManager().waitForPendingComplete(TIMEOUT, true);
}
+ public static void stopPersistence(Application origApp) throws InterruptedException, TimeoutException {
+ stopPersistence(origApp.getManagementContext());
+ }
+
+ public static void stopPersistence(ManagementContext managementContext) throws InterruptedException, TimeoutException {
+ RebindManager rebindManager = managementContext.getRebindManager();
+ rebindManager.waitForPendingComplete(TIMEOUT, true);
+ rebindManager.stop();
+ }
+
public static void checkCurrentMementoSerializable(Application app) throws Exception {
checkCurrentMementoSerializable(app.getManagementContext());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/transformer/CompoundTransformerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/transformer/CompoundTransformerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/transformer/CompoundTransformerTest.java
index 2fbd74e..7187826 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/transformer/CompoundTransformerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/transformer/CompoundTransformerTest.java
@@ -63,7 +63,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
-@SuppressWarnings("serial")
public class CompoundTransformerTest extends RebindTestFixtureWithApp {
private static final Logger LOG = LoggerFactory.getLogger(CompoundTransformerTest.class);
@@ -430,6 +429,7 @@ public class CompoundTransformerTest extends RebindTestFixtureWithApp {
protected TestApplication transformAndRebind(CompoundTransformer transformer) throws Exception {
RebindTestUtils.waitForPersisted(origApp);
BrooklynMementoRawData newRawData = transform(origManagementContext, transformer);
+ RebindTestUtils.stopPersistence(origApp);
newMementoDir = persist(newRawData);
return rebind(newMementoDir);
}
@@ -492,6 +492,7 @@ public class CompoundTransformerTest extends RebindTestFixtureWithApp {
// Example method, similar to EntityPredicates where we want to move the annonymous inner class
// to be a named inner class
+ @SuppressWarnings("serial")
public static <T> Predicate<Entity> idEqualTo(final T paramVal) {
return new SerializablePredicate<Entity>() {
@Override
@@ -501,6 +502,7 @@ public class CompoundTransformerTest extends RebindTestFixtureWithApp {
};
}
+ @SuppressWarnings("serial")
private static class RenamedIdEqualToPredicate implements SerializablePredicate<Entity> {
private String val;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocationRebindTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocationRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocationRebindTest.java
index 3a66266..caef64e 100644
--- a/core/src/test/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocationRebindTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocationRebindTest.java
@@ -113,7 +113,7 @@ public class FixedListMachineProvisioningLocationRebindTest {
}
private TestApplication rebind() throws Exception {
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
return (TestApplication) RebindTestUtils.rebind(mementoDir, getClass().getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationRebindTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationRebindTest.java
index 0170b5a..e26b210 100644
--- a/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationRebindTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationRebindTest.java
@@ -113,7 +113,7 @@ public class MultiLocationRebindTest {
}
private TestApplication rebind(boolean checkSerializable) throws Exception {
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
if (checkSerializable) {
RebindTestUtils.checkCurrentMementoSerializable(origApp);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
index faab9fc..ab0b708 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
@@ -205,7 +205,7 @@ public abstract class AbstractBlueprintTest {
if (options.newManagementContext == null) options.newManagementContext(newMgmt);
for (Application origApp : origApps) {
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
}
mgmt = options.newManagementContext;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
index 6d9fabd..96b5786 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
@@ -188,7 +188,7 @@ public class JcloudsByonLocationResolverStubbedRebindTest extends AbstractJcloud
if (options.origManagementContext == null) options.origManagementContext(origManagementContext);
if (options.newManagementContext == null) options.newManagementContext(createNewManagementContext(options.mementoDir));
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
newManagementContext = options.newManagementContext;
newApp = RebindTestUtils.rebind(options);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ca9a7c9e/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
index 446aaa9..7f6e7c0 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
@@ -27,8 +27,6 @@ import java.io.File;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.OsDetails;
-import org.apache.brooklyn.core.entity.Entities;
-import org.apache.brooklyn.core.entity.factory.ApplicationBuilder;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.mgmt.rebind.RebindOptions;
import org.apache.brooklyn.core.mgmt.rebind.RebindTestUtils;
@@ -175,7 +173,7 @@ public class RebindJcloudsLocationLiveTest extends AbstractJcloudsLiveTest {
// Force it to be persisted again. Expect to pesist without the NodeMetadata and Template.
app2.getManagementContext().getRebindManager().getChangeListener().onChanged(loc2);
app2.getManagementContext().getRebindManager().getChangeListener().onChanged(machine2);
- RebindTestUtils.waitForPersisted(app2);
+ RebindTestUtils.stopPersistence(app2);
String newMachineXml = new String(java.nio.file.Files.readAllBytes(persistedMachineFile.toPath()));
assertFalse(newMachineXml.contains("AWSEC2TemplateOptions"), newMachineXml);
@@ -241,7 +239,7 @@ public class RebindJcloudsLocationLiveTest extends AbstractJcloudsLiveTest {
// Force it to be persisted again. Expect to pesist without the NodeMetadata and Template.
app2.getManagementContext().getRebindManager().getChangeListener().onChanged(loc2);
app2.getManagementContext().getRebindManager().getChangeListener().onChanged(machine2);
- RebindTestUtils.waitForPersisted(app2);
+ RebindTestUtils.stopPersistence(app2);
String newMachineXml = new String(java.nio.file.Files.readAllBytes(persistedMachineFile.toPath()));
assertFalse(newMachineXml.contains("NodeMetadataImpl"), newMachineXml);
@@ -327,7 +325,7 @@ public class RebindJcloudsLocationLiveTest extends AbstractJcloudsLiveTest {
}
private TestApplication rebind(RebindOptions options) throws Exception {
- RebindTestUtils.waitForPersisted(origApp);
+ RebindTestUtils.stopPersistence(origApp);
return (TestApplication) RebindTestUtils.rebind(options);
}
}
[3/3] brooklyn-server git commit: This closes #400
Posted by al...@apache.org.
This closes #400
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/59cbcc59
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/59cbcc59
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/59cbcc59
Branch: refs/heads/master
Commit: 59cbcc593e586cd94529f2848dbe9777566a5f2d
Parents: 01140cd ca9a7c9
Author: Aled Sage <al...@gmail.com>
Authored: Fri Nov 4 16:41:31 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Nov 4 16:41:31 2016 +0000
----------------------------------------------------------------------
.../AbstractJcloudsRebindStubYamlTest.java | 5 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 2 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 2 +-
.../brooklyn/camp/brooklyn/RebindOsgiTest.java | 5 +-
.../mgmt/rebind/RebindCatalogEntityTest.java | 2 +-
.../core/mgmt/rebind/RebindCatalogItemTest.java | 3 +-
...talogWhenCatalogPersistenceDisabledTest.java | 22 ++------
.../rebind/RebindEntityDynamicTypeInfoTest.java | 2 +-
.../core/mgmt/rebind/RebindEntityTest.java | 4 +-
.../core/mgmt/rebind/RebindLocationTest.java | 4 +-
.../RebindManagerExceptionHandlerTest.java | 55 ++++----------------
.../core/mgmt/rebind/RebindOptions.java | 8 ++-
.../core/mgmt/rebind/RebindPolicyTest.java | 4 +-
.../core/mgmt/rebind/RebindTestFixture.java | 25 +++++----
.../core/mgmt/rebind/RebindTestUtils.java | 11 ++++
.../transformer/CompoundTransformerTest.java | 4 +-
...stMachineProvisioningLocationRebindTest.java | 2 +-
.../location/multi/MultiLocationRebindTest.java | 2 +-
.../blueprints/AbstractBlueprintTest.java | 2 +-
...dsByonLocationResolverStubbedRebindTest.java | 2 +-
.../jclouds/RebindJcloudsLocationLiveTest.java | 8 ++-
...ClockerDynamicLocationPatternRebindTest.java | 4 +-
22 files changed, 78 insertions(+), 100 deletions(-)
----------------------------------------------------------------------