Repository: brooklyn-server Updated Branches: refs/heads/0.11.x 93b00966a -> 13eedd531
Fix itest for running backgrounded (cherry picked from commit 9978afef865a53bb95437be517292e1768f3a259) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/24ed1de5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/24ed1de5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/24ed1de5 Branch: refs/heads/0.11.x Commit: 24ed1de50ef42c55e5b42716d7c55f87ca26fb4b Parents: 93b0096 Author: Aled Sage <aled.s...@gmail.com> Authored: Tue Apr 11 22:15:40 2017 +0100 Committer: Richard Downer <rich...@apache.org> Committed: Wed Apr 12 10:20:26 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/24ed1de5/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java ---------------------------------------------------------------------- diff --git a/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java b/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java index a9cf63e..a7bef36 100644 --- a/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java +++ b/karaf/itests/src/test/java/org/apache/brooklyn/karaf/itests/FeatureInstallationTest.java @@ -17,6 +17,7 @@ package org.apache.brooklyn.karaf.itests; import static org.ops4j.pax.exam.CoreOptions.maven; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureSecurity; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; @@ -71,6 +72,7 @@ public class FeatureInstallationTest extends TestBase { return new Option[]{ karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")), configureSecurity().disableKarafMBeanServerBuilder(), + configureConsole().ignoreLocalConsole(), keepRuntimeFolder(), editConfigurationFilePut("etc/system.properties", "features.xml", System.getProperty("features.xml")), editConfigurationFileExtend(
