Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-8577] Minor updates to assembly unit tests to pass (#855) 

* Add broker.waitUntilStarted(5000l); to broker startup tests
 * Add exclusion for jolokia-access.xml to xml validation tests
This commit is contained in:
Matt Pavlovich 2022-06-29 17:26:35 -05:00 committed by GitHub
parent 1483d1c1e0
commit 2b58e7b09f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
View File

@ -96,6 +96,7 @@ public class BrokerXmlConfigStartTest {
System.err.println("Broker config: " + configUrl); System.err.println("Broker config: " + configUrl);
broker = BrokerFactory.createBroker(configUrl); broker = BrokerFactory.createBroker(configUrl);
broker.start(); broker.start();
broker.waitUntilStarted(5000l);
// alive, now try connect to connect // alive, now try connect to connect
try { try {
for (TransportConnector transport : broker.getTransportConnectors()) { for (TransportConnector transport : broker.getTransportConnectors()) {

2
assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java
View File

@ -51,7 +51,7 @@ public class ValidateXMLConfigTest {
File sampleConfDir = new File("target/conf"); File sampleConfDir = new File("target/conf");
final HashSet<String> skipped = new HashSet<String>(java.util.Arrays.asList(new String[]{ final HashSet<String> skipped = new HashSet<String>(java.util.Arrays.asList(new String[]{
"resin-web.xml", "web.xml", "camel.xml" "resin-web.xml", "web.xml", "camel.xml", "jolokia-access.xml"
})); }));
for (File xmlFile : sampleConfDir.listFiles(new FileFilter() { for (File xmlFile : sampleConfDir.listFiles(new FileFilter() {