You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/03/02 12:16:10 UTC
[09/10] brooklyn-server git commit: copy resources to a folder and
use that for cleaning orphans
copy resources to a folder and use that for cleaning orphans
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1f30e25c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1f30e25c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1f30e25c
Branch: refs/heads/master
Commit: 1f30e25c7fa4e702f5fd7bee2d19d4b8f30815aa
Parents: b5cb107
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Feb 18 13:20:35 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Mar 1 09:00:33 2017 +0000
----------------------------------------------------------------------
.../CleanOrphanedLocationsIntegrationTest.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1f30e25c/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 0348892..4d59735 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.launcher;
import java.io.File;
import java.util.Set;
+import java.util.zip.ZipFile;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode;
@@ -41,6 +42,10 @@ import org.apache.brooklyn.core.server.BrooklynServerPaths;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.collections.MutableSet;
+import org.apache.brooklyn.util.core.ResourceUtils;
+import org.apache.brooklyn.util.core.file.ArchiveUtils;
+import org.apache.brooklyn.util.core.osgi.BundleMaker;
+import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.javalang.JavaClassNames;
import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.time.Duration;
@@ -67,13 +72,26 @@ public class CleanOrphanedLocationsIntegrationTest extends AbstractCleanOrphaned
private Set<ManagementContext> mgmts;
private ManagementContext mgmt;
+ private String copyResourcePathToTempPath(String resourcePath) {
+ BundleMaker bm = new BundleMaker(ResourceUtils.create(this));
+ bm.setDefaultClassForLoading(CleanOrphanedLocationsIntegrationTest.class);
+ File jar = bm.createJarFromClasspathDir(resourcePath);
+ File output = Os.newTempDir("brooklyn-test-resouce-from-"+resourcePath);
+ try {
+ ArchiveUtils.extractZip(new ZipFile(jar), output.getAbsolutePath());
+ return output.getAbsolutePath();
+ } catch (Exception e) {
+ throw Exceptions.propagate(e);
+ }
+ }
+
@BeforeMethod(alwaysRun = true)
@Override
public void setUp() throws Exception {
super.setUp();
- persistenceDirWithOrphanedLocations = getClass().getResource(PERSISTED_STATE_PATH_WITH_ORPHANED_LOCATIONS).getFile();
- persistenceDirWithoutOrphanedLocations = getClass().getResource(PERSISTED_STATE_PATH_WITHOUT_ORPHANED_LOCATIONS).getFile();
- persistenceDirWithMultipleLocationsOccurrence = getClass().getResource(PERSISTED_STATE_PATH_WITH_MULTIPLE_LOCATIONS_OCCURRENCE).getFile();
+ persistenceDirWithOrphanedLocations = copyResourcePathToTempPath(PERSISTED_STATE_PATH_WITH_ORPHANED_LOCATIONS);
+ persistenceDirWithoutOrphanedLocations = copyResourcePathToTempPath(PERSISTED_STATE_PATH_WITHOUT_ORPHANED_LOCATIONS);
+ persistenceDirWithMultipleLocationsOccurrence = copyResourcePathToTempPath(PERSISTED_STATE_PATH_WITH_MULTIPLE_LOCATIONS_OCCURRENCE);
destinationDir = Os.newTempDir(getClass());