(logging-log4j2) branch 2.x updated: Replace fixed delay with polling in `SyslogAppenderCustomLayoutTest` (#3944)

[vy]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.x by this push:
     new 1758179ef0 Replace fixed delay with polling in 
`SyslogAppenderCustomLayoutTest` (#3944)
1758179ef0 is described below

commit 1758179ef0206e78b6b61b7ac45d3e237685e360
Author: Kevin Cruz <kcru...@illinois.edu>
AuthorDate: Mon Oct 13 04:40:59 2025 -0500

    Replace fixed delay with polling in `SyslogAppenderCustomLayoutTest` (#3944)
---
 .../core/appender/SyslogAppenderTestBase.java      | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
index 5af62582bf..ff2e85ea7c 100644
--- 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
+++ 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
@@ -16,6 +16,8 @@
  */
 package org.apache.logging.log4j.core.appender;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -49,7 +51,7 @@ abstract class SyslogAppenderTestBase {
             "TestApp - Audit [Transfer@18060 Amount=\"200.00\" 
FromAccount=\"123457\" ToAccount=\"123456\"]"
                     + "[RequestContext@18060 ipAddress=\"192.168.0.120\" 
loginId=\"JohnDoe\"] Transfer Complete";
     protected LoggerContext ctx = LoggerContext.getContext();
-    protected static final int DEFAULT_TIMEOUT_IN_MS = 100;
+    protected static final int DEFAULT_TIMEOUT_IN_MS = 3000;
     protected MockSyslogServer syslogServer;
     protected SyslogAppender appender;
     protected Logger root = ctx.getLogger("SyslogAppenderTest");
@@ -61,7 +63,7 @@ abstract class SyslogAppenderTestBase {
         LoggerContext.getContext().reconfigure();
     }
 
-    protected void sendAndCheckLegacyBsdMessages(final List<String> 
messagesToSend) throws InterruptedException {
+    protected void sendAndCheckLegacyBsdMessages(final List<String> 
messagesToSend) {
         for (final String message : messagesToSend) {
             sendDebugLegacyBsdMessage(message);
         }
@@ -69,7 +71,7 @@ abstract class SyslogAppenderTestBase {
         checkTheEqualityOfSentAndReceivedMessages(Level.DEBUG);
     }
 
-    protected void sendAndCheckLegacyBsdMessage(final String message) throws 
InterruptedException {
+    protected void sendAndCheckLegacyBsdMessage(final String message) {
         sendDebugLegacyBsdMessage(message);
         checkTheNumberOfSentAndReceivedMessages();
         checkTheEqualityOfSentAndReceivedMessages(Level.DEBUG);
@@ -80,7 +82,7 @@ abstract class SyslogAppenderTestBase {
         root.debug(message);
     }
 
-    protected void sendAndCheckStructuredMessages(final int numberOfMessages) 
throws InterruptedException {
+    protected void sendAndCheckStructuredMessages(final int numberOfMessages) {
         for (int i = 0; i < numberOfMessages; i++) {
             sendInfoStructuredMessage();
         }
@@ -88,7 +90,7 @@ abstract class SyslogAppenderTestBase {
         checkTheEqualityOfSentAndReceivedMessages(Level.INFO);
     }
 
-    protected void sendAndCheckStructuredMessage() throws InterruptedException 
{
+    protected void sendAndCheckStructuredMessage() {
         sendInfoStructuredMessage();
         checkTheNumberOfSentAndReceivedMessages();
         checkTheEqualityOfSentAndReceivedMessages(Level.INFO);
@@ -108,15 +110,13 @@ abstract class SyslogAppenderTestBase {
         root.info(MarkerManager.getMarker("EVENT"), msg);
     }
 
-    protected void checkTheNumberOfSentAndReceivedMessages() throws 
InterruptedException {
-        assertEquals(
-                sentMessages.size(),
-                getReceivedMessages(DEFAULT_TIMEOUT_IN_MS).size(),
-                "The number of received messages should be equal with the 
number of sent messages");
+    protected void checkTheNumberOfSentAndReceivedMessages() {
+        await().atMost(DEFAULT_TIMEOUT_IN_MS, MILLISECONDS)
+                .until(() -> syslogServer.getMessageList().size() == 
sentMessages.size());
     }
 
-    protected void checkTheEqualityOfSentAndReceivedMessages(final Level 
expectedLevel) throws InterruptedException {
-        final List<String> receivedMessages = 
getReceivedMessages(DEFAULT_TIMEOUT_IN_MS);
+    protected void checkTheEqualityOfSentAndReceivedMessages(final Level 
expectedLevel) {
+        final List<String> receivedMessages = getReceivedMessages();
 
         assertNotNull(receivedMessages, "No messages received");
         for (int i = 0; i < receivedMessages.size(); i++) {
@@ -148,10 +148,7 @@ abstract class SyslogAppenderTestBase {
         root.setLevel(Level.DEBUG);
     }
 
-    protected List<String> getReceivedMessages(final int timeOutInMs) throws 
InterruptedException {
-        synchronized (syslogServer) {
-            syslogServer.wait(timeOutInMs);
-        }
+    protected List<String> getReceivedMessages() {
         return syslogServer.getMessageList();
     }