This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 99ef0c76bb69 CAMEL-23923: Remove unnecessary Thread.sleep from
camel-syslog tests (#24447)
99ef0c76bb69 is described below
commit 99ef0c76bb6943613578a6cc2da6b48f5b06c241
Author: Guillaume Nodet <[email protected]>
AuthorDate: Sat Jul 11 19:44:35 2026 +0200
CAMEL-23923: Remove unnecessary Thread.sleep from camel-syslog tests
(#24447)
* CAMEL-23923: Fix flaky tests in camel-syslog by replacing Thread.sleep
with Awaitility
Replace Thread.sleep(100) calls with Awaitility
await().atMost().untilAsserted()
in all 7 affected syslog test classes. This eliminates non-deterministic
timing
dependencies and makes the tests more robust by waiting for the mock
endpoints
to be satisfied rather than relying on fixed-time delays.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* CAMEL-23923: Increase Awaitility timeout to 10s for single-message tests
Match MockEndpoint's default 10s latch timeout to avoid reducing the
effective wait time.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* CAMEL-23923: Use MockEndpoint.assertIsSatisfied(context, timeout, unit)
instead of Awaitility
Address review feedback: use the built-in MockEndpoint timeout overload
rather than adding an Awaitility dependency.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* CAMEL-23923: Simplify single-message tests — just remove Thread.sleep
assertIsSatisfied(context) already defaults to a 10s latch timeout,
so the explicit timeout was redundant. Only the many-messages tests
(100 UDP packets) need an extended 20s timeout since the per-send
pacing sleep was removed.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
---------
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../org/apache/camel/component/syslog/AutomatedConversionTest.java | 2 --
.../java/org/apache/camel/component/syslog/MinaDataFormatTest.java | 1 -
.../org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java | 4 ++--
.../java/org/apache/camel/component/syslog/NettyDataFormatTest.java | 1 -
.../org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java | 4 ++--
.../java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java | 1 -
.../java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java | 1 -
7 files changed, 4 insertions(+), 10 deletions(-)
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
index 06f732b60a77..234bdd03ba50 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
@@ -60,13 +60,11 @@ public class AutomatedConversionTest extends
CamelTestSupport {
byte[] data = rfc3164Message.getBytes();
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
for (int i = 0; i < messageCount; i++) {
byte[] data = rfc5424Message.getBytes();
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
} finally {
socket.close();
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
index 837a010eed8b..7dd6cc0b2970 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
@@ -61,7 +61,6 @@ public class MinaDataFormatTest extends CamelTestSupport {
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
} finally {
socket.close();
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
index b30d6dab44a2..1cb3dccfd7e1 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.syslog;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -58,13 +59,12 @@ public class MinaManyUDPMessagesTest extends
CamelTestSupport {
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
} finally {
socket.close();
}
- MockEndpoint.assertIsSatisfied(context);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Override
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
index 3d04a96466af..ded083fe52c7 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
@@ -61,7 +61,6 @@ public class NettyDataFormatTest extends CamelTestSupport {
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
} finally {
socket.close();
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
index 084d4d962be2..abb609c9fe97 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.syslog;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -58,13 +59,12 @@ public class NettyManyUDPMessagesTest extends
CamelTestSupport {
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
} finally {
socket.close();
}
- MockEndpoint.assertIsSatisfied(context);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Override
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
index f15a967db562..cf1e23f6b61d 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
@@ -67,7 +67,6 @@ public class SyslogSpringMinaTest extends
CamelSpringTestSupport {
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
} finally {
socket.close();
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
index cf00633f609f..71720d4c2482 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
@@ -66,7 +66,6 @@ public class SyslogSpringNettyTest extends
CamelSpringTestSupport {
DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort.getPort());
socket.send(packet);
- Thread.sleep(100);
}
} finally {
socket.close();
