diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/src/test/java/org/springframework/cloud/launcher/cli/LauncherCommandTests.java b/spring-cloud-launcher/spring-cloud-launcher-cli/src/test/java/org/springframework/cloud/launcher/cli/LauncherCommandTests.java index 3afaddf..130ed9c 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-cli/src/test/java/org/springframework/cloud/launcher/cli/LauncherCommandTests.java +++ b/spring-cloud-launcher/spring-cloud-launcher-cli/src/test/java/org/springframework/cloud/launcher/cli/LauncherCommandTests.java @@ -19,6 +19,7 @@ package org.springframework.cloud.launcher.cli; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -31,12 +32,14 @@ public class LauncherCommandTests { public OutputCapture output = new OutputCapture(); @Test + @Ignore("See DeployerThreadTests for similar functionality") public void testCreateClassLoaderAndListDeployables() throws Exception { new LauncherCommand().run("--list"); assertThat(output.toString(), containsString("configserver")); } @Test + @Ignore("See DeployerThreadTests for similar functionality") public void testNonOptionArgsPassedDown() throws Exception { new LauncherCommand().run("--list", "--", "--spring.profiles.active=test"); assertThat(output.toString(), containsString("foo")); diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java index 9ad751e..6c9f42b 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java @@ -87,8 +87,12 @@ public class DeployerThread extends Thread { } private void quiet() { - LogbackLoggingSystem.get(ClassUtils.getDefaultClassLoader()).setLogLevel("ROOT", - LogLevel.OFF); + try { + LogbackLoggingSystem.get(ClassUtils.getDefaultClassLoader()).setLogLevel("ROOT", + LogLevel.OFF); + } catch (Exception e) { + logger.error("Unable to turn of ROOT logger for quiet()", e); + } } private void list() { diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerThreadTests.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerThreadTests.java index de2c2c5..f360666 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerThreadTests.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerThreadTests.java @@ -36,4 +36,10 @@ public class DeployerThreadTests { assertThat(output.toString(), containsString("configserver")); } + + @Test + public void testNonOptionArgsPassedDown() throws Exception { + new DeployerThread(DeployerThread.class.getClassLoader(), "--launcher.list=true", "--spring.profiles.active=test").run(); + assertThat(output.toString(), containsString("foo")); + } } diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/resources/cloud-test.yml b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/resources/cloud-test.yml new file mode 100644 index 0000000..7c68477 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/resources/cloud-test.yml @@ -0,0 +1,9 @@ +spring: + cloud: + launcher: + deployables: + foo: + coordinates: com.example:foo:0.0.1-SNAPSHOT + port: 8000 + waitUntilStarted: true + order: -200