Tweak server timeouts

Author: ppkarwasz

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java

@@ -22,7 +22,7 @@
 import java.io.InputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.logging.log4j.Level;
@@ -49,6 +49,8 @@
 @UsingTestProperties
 class JsonTemplateLayoutNullEventDelimiterTest {
 
+    private static final int TIMEOUT_MS = 10_000;
+
     private static Logger LOGGER = StatusLogger.getLogger();
 
     private static TcpServer server;
@@ -95,8 +97,7 @@ public Result filter(LogEvent event) {
         try {
             Awaitility
                     .await()
-                    .atMost(Duration.ofSeconds(10))
-                    .pollDelay(Duration.ofSeconds(1))
+                    .atMost(TIMEOUT_MS, TimeUnit.MILLISECONDS)
                     .until(() -> server.getTotalReadByteCount() >= expectedBytes.length);
         } catch (final ConditionTimeoutException e) {
             LOGGER.info("Timeout reached while waiting for {} bytes.", expectedBytes.length);
@@ -121,10 +122,10 @@ private TcpServer(final int port) throws IOException {
             this.serverSocket = new ServerSocket(port);
             this.outputStream = new ByteArrayOutputStream();
             serverSocket.setReuseAddress(true);
-            serverSocket.setSoTimeout(5_000);
+            serverSocket.setSoTimeout(TIMEOUT_MS);
             setDaemon(true);
             start();
-            LOGGER.info("TcpServer started on port {}.", port);
+            LOGGER.info("TcpServer started on port {}.", serverSocket.getLocalPort());
         }
 
         @Override