Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid duplicate script

Browse Source 
This commit avoids a script duplication: the integration test runs the
sample instead of a copy of it in the repro directory.

Also switched the sample from ActiveMQ to HornetQ as #323 revealed
some locking on CI. Hopefully that should fix it as HornetQ is non
persistent and can be embedded several times in the same VM.

Fixes gh-1456
This commit is contained in:
Stephane Nicoll
2014-08-29 10:26:29 +02:00
parent 0dc389f5b3
commit 85c95744f9
4 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java
View File

@@ -73,10 +73,5 @@ public class ReproIntegrationTests {
this.cli.jar("secure.groovy", "crsh.groovy");
}
@Test
public void jmsListener() throws Exception {
this.cli.run("jms.groovy");
assertThat(this.cli.getOutput(), containsString("Hello World"));
}
}

4
spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
View File

@@ -136,12 +136,10 @@ public class SampleIntegrationTests {
}
@Test
@Ignore("Intermittent failure on CI. See #323")
public void jmsSample() throws Exception {
String output = this.cli.run("jms.groovy");
assertTrue("Wrong output: " + output,
output.contains("Received Greetings from Spring Boot via ActiveMQ"));
FileUtils.deleteDirectory(new File("activemq-data"));// cleanup ActiveMQ cruft
output.contains("Received Greetings from Spring Boot via HornetQ"));
}
@Test