diff --git a/tests/config/logging-CI.properties b/tests/config/logging-CI.properties index 55188df617..bd2e7a3634 100644 --- a/tests/config/logging-CI.properties +++ b/tests/config/logging-CI.properties @@ -20,7 +20,7 @@ # Additional logger names to configure (root logger is always configured) # Root logger option -loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests,org.apache.activemq.audit +loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests,org.apache.activemq.cli.test,org.apache.activemq.audit # Root logger level logger.level=WARN @@ -43,7 +43,7 @@ logger.handlers=CONSOLE,TEST # to enable audit change the level to INFO logger.org.apache.activemq.audit.level=ERROR -logger.org.apache.activemq.audit.handlers=CONSOLE,FILE +logger.org.apache.activemq.audit.handlers=CONSOLE,FILE,TEST logger.org.apache.activemq.audit.useParentHandlers=false # Console handler configuration diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java index b444dffdfc..8747a9ba48 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java @@ -34,7 +34,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.logs.AssertionLoggerHandler; import org.apache.activemq.artemis.spi.core.security.ActiveMQBasicSecurityManager; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -import org.apache.activemq.artemis.tests.util.Wait; import org.jboss.logmanager.Logger; import org.junit.AfterClass; import org.junit.Assert; @@ -232,8 +231,8 @@ public class MultiThreadedAuditLoggingTest extends ActiveMQTestBase { assertFalse(AssertionLoggerHandler.matchText(".*User queue1\\(queue1\\).* is consuming a message from queue2")); assertFalse(AssertionLoggerHandler.matchText(".*User queue2\\(queue2\\).* is consuming a message from queue1")); - Wait.assertTrue(() -> AssertionLoggerHandler.matchText(".*User queue2\\(queue2\\).* is consuming a message from queue2")); - Wait.assertTrue(() -> AssertionLoggerHandler.matchText(".*User queue1\\(queue1\\).* is consuming a message from queue1")); + assertTrue(AssertionLoggerHandler.matchText(".*User queue2\\(queue2\\).* is consuming a message from queue2")); + assertTrue(AssertionLoggerHandler.matchText(".*User queue1\\(queue1\\).* is consuming a message from queue1")); } } }