This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit c8f8b7669ba10b178f95dc16eac2c0ff07af4113 Author: Alex Heneveld <[email protected]> AuthorDate: Mon Nov 7 09:39:25 2022 +0000 remove some warnings during test --- .../brooklyn/launcher/common/BrooklynPropertiesFactoryHelper.java | 4 ++-- .../brooklyn/launcher/AbstractBrooklynLauncherRebindTest.java | 8 +++++++- .../BrooklynLauncherRebindManagementNodeStateListenerTest.java | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelper.java b/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelper.java index 2aff0f6faa..e1c99c2202 100644 --- a/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelper.java +++ b/launcher-common/src/main/java/org/apache/brooklyn/launcher/common/BrooklynPropertiesFactoryHelper.java @@ -110,9 +110,9 @@ public class BrooklynPropertiesFactoryHelper { return builder; } else { if (globalBrooklynPropertiesFile != null) - LOG.warn("Ignoring globalBrooklynPropertiesFile "+globalBrooklynPropertiesFile+" because explicit brooklynProperties supplied"); + LOG.info("Ignoring globalBrooklynPropertiesFile "+globalBrooklynPropertiesFile+" because explicit brooklynProperties supplied"); if (localBrooklynPropertiesFile != null) - LOG.warn("Ignoring localBrooklynPropertiesFile "+localBrooklynPropertiesFile+" because explicit brooklynProperties supplied"); + LOG.info("Ignoring localBrooklynPropertiesFile "+localBrooklynPropertiesFile+" because explicit brooklynProperties supplied"); return Builder.fromProperties(brooklynProperties); } } diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractBrooklynLauncherRebindTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractBrooklynLauncherRebindTest.java index 95552b6c36..db8f986953 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractBrooklynLauncherRebindTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractBrooklynLauncherRebindTest.java @@ -19,6 +19,8 @@ package org.apache.brooklyn.launcher; import java.util.jar.Attributes; + +import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.util.stream.InputStreamSource; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -131,8 +133,12 @@ public abstract class AbstractBrooklynLauncherRebindTest { } protected BrooklynLauncher newLauncherForTests(PersistMode persistMode, HighAvailabilityMode haMode) { + return newLauncherForTests(persistMode, haMode); + } + + protected BrooklynLauncher newLauncherForTests(PersistMode persistMode, HighAvailabilityMode haMode, BrooklynProperties optionalProperties) { BrooklynLauncher launcher = BrooklynLauncher.newInstance() - .brooklynProperties(LocalManagementContextForTests.builder(true).setOsgiEnablementAndReuse(useOsgi(), reuseOsgi()).buildProperties()) + .brooklynProperties(optionalProperties!=null ? optionalProperties : LocalManagementContextForTests.builder(true).setOsgiEnablementAndReuse(useOsgi(), reuseOsgi()).buildProperties()) .persistMode(persistMode) .highAvailabilityMode(haMode) .persistPeriod(Duration.millis(10)) diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java index 35018780ae..1beef2dc78 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java @@ -99,8 +99,7 @@ public class BrooklynLauncherRebindManagementNodeStateListenerTest extends Abstr } }; - return super.newLauncherForTests(persistMode, haMode) - .brooklynProperties(brooklynProperties) + return super.newLauncherForTests(persistMode, haMode, brooklynProperties) .catalogInitialization(catInit); }
