From 2b58e7b09f1e1d21c8893c4aa10adf7838e09259 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Wed, 29 Jun 2022 17:26:35 -0500 Subject: [PATCH] [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 --- .../org/apache/activemq/config/BrokerXmlConfigStartTest.java | 1 + .../java/org/apache/activemq/config/ValidateXMLConfigTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java index b95ba43581..61cd16e364 100644 --- a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java +++ b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java @@ -96,6 +96,7 @@ public class BrokerXmlConfigStartTest { System.err.println("Broker config: " + configUrl); broker = BrokerFactory.createBroker(configUrl); broker.start(); + broker.waitUntilStarted(5000l); // alive, now try connect to connect try { for (TransportConnector transport : broker.getTransportConnectors()) { diff --git a/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java b/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java index 87402f9d41..dbb202a4fe 100644 --- a/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java +++ b/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java @@ -51,7 +51,7 @@ public class ValidateXMLConfigTest { File sampleConfDir = new File("target/conf"); final HashSet skipped = new HashSet(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() {