Repository: brooklyn-server Updated Branches: refs/heads/master e3f4175ce -> c586b2651
Enable persistence for tests and point it at the target folder so it gets cleaned up Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3b6fb3e1 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3b6fb3e1 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3b6fb3e1 Branch: refs/heads/master Commit: 3b6fb3e19bf4613e5794d1f05768375df6530da6 Parents: 4b11f50 Author: Svetoslav Neykov <[email protected]> Authored: Thu Jul 7 18:13:55 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Thu Jul 7 18:20:52 2016 +0300 ---------------------------------------------------------------------- .../src/test/java/org/apache/brooklyn/KarafTestUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3b6fb3e1/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java ---------------------------------------------------------------------- diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java b/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java index 013bf58..d8920ef 100644 --- a/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java +++ b/karaf/itest/src/test/java/org/apache/brooklyn/KarafTestUtils.java @@ -22,12 +22,14 @@ import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.MavenUtils.asInProject; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; import java.io.File; +import org.apache.brooklyn.util.text.Identifiers; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; import org.ops4j.pax.exam.options.MavenArtifactUrlReference; @@ -44,7 +46,9 @@ public class KarafTestUtils { configureConsole().ignoreLocalConsole(), logLevel(LogLevel.INFO), features(karafStandardFeaturesRepository(), "eventadmin"), - junitBundles() + junitBundles(), + editConfigurationFilePut("etc/org.apache.brooklyn.osgilauncher.cfg", "persistMode", "AUTO"), + editConfigurationFilePut("etc/org.apache.brooklyn.osgilauncher.cfg", "persistenceDir", new File("target/paxexam/persistence/" + Identifiers.makeRandomId(6) + "/").getAbsolutePath()), }; public static MavenUrlReference karafStandardFeaturesRepository() {
