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/07/20 17:20:17 UTC
[10/11] brooklyn-server git commit: Fix integration test to use
DeleteOrphanedStateTransformer + fix for jenkins + fix flag in MyEnricher
Fix integration test to use DeleteOrphanedStateTransformer + fix for jenkins + fix flag in MyEnricher
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/213fc5ed
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/213fc5ed
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/213fc5ed
Branch: refs/heads/master
Commit: 213fc5ed95bc3dd08175f3fe67c846265ffb0f1d
Parents: 660956f
Author: Ivana Yovcheva <iv...@gmail.com>
Authored: Wed Jul 20 12:25:32 2016 +0300
Committer: Ivana Yovcheva <iv...@gmail.com>
Committed: Wed Jul 20 15:59:15 2016 +0300
----------------------------------------------------------------------
.../brooklyn/launcher/AbstractCleanOrphanedStateTest.java | 2 +-
.../launcher/CleanOrphanedLocationsIntegrationTest.java | 6 +++---
.../copy-persisted-state-destination/emptyDirKeeper | 0
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/213fc5ed/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java
index f8d7455..d26c411 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java
@@ -162,7 +162,7 @@ public abstract class AbstractCleanOrphanedStateTest extends RebindTestFixtureWi
}
public static class MyEnricher extends AbstractEnricher {
- @SetFromFlag Object obj;
+ @SetFromFlag("myobj") Object obj;
}
public static class MyPolicy extends AbstractPolicy {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/213fc5ed/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
index cb81bde..e59e526 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
@@ -32,7 +32,7 @@ import org.apache.brooklyn.core.mgmt.persist.PersistMode;
import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore;
import org.apache.brooklyn.core.mgmt.rebind.PersistenceExceptionHandlerImpl;
import org.apache.brooklyn.core.mgmt.rebind.RebindManagerImpl;
-import org.apache.brooklyn.core.mgmt.rebind.transformer.impl.DeleteOrphanedLocationsTransformer;
+import org.apache.brooklyn.core.mgmt.rebind.transformer.impl.DeleteOrphanedStateTransformer;
import org.apache.brooklyn.core.server.BrooklynServerConfig;
import org.apache.brooklyn.core.server.BrooklynServerPaths;
import org.apache.brooklyn.test.Asserts;
@@ -63,7 +63,7 @@ public class CleanOrphanedLocationsIntegrationTest {
private String destinationDir;
private String persistenceLocation;
- private DeleteOrphanedLocationsTransformer transformer;
+ private DeleteOrphanedStateTransformer transformer;
private ManagementContext managementContext;
@@ -75,7 +75,7 @@ public class CleanOrphanedLocationsIntegrationTest {
destinationDir = getClass().getResource(PERSISTED_STATE_DESTINATION_PATH).getFile();
- transformer = DeleteOrphanedLocationsTransformer.builder().build();
+ transformer = DeleteOrphanedStateTransformer.builder().build();
}
private void initManagementContextAndPersistence(String persistenceDir) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/213fc5ed/launcher/src/test/resources/orphaned-locations-test-data/copy-persisted-state-destination/emptyDirKeeper
----------------------------------------------------------------------
diff --git a/launcher/src/test/resources/orphaned-locations-test-data/copy-persisted-state-destination/emptyDirKeeper b/launcher/src/test/resources/orphaned-locations-test-data/copy-persisted-state-destination/emptyDirKeeper
new file mode 100644
index 0000000..e69de29