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 1af4332c915c CAMEL-24043: Fix flaky tests (batch 11)
1af4332c915c is described below
commit 1af4332c915c61188d21a51ec06a809fcdd56f6b
Author: Guillaume Nodet <[email protected]>
AuthorDate: Wed Jul 15 12:30:19 2026 +0200
CAMEL-24043: Fix flaky tests (batch 11)
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* CAMEL-24043: Fix flaky tests (batch 11)
Use timed MockEndpoint assertions and increase Awaitility timeouts
to reduce flakiness under CI load across postprocessor, flatpack,
hazelcast, mail and test-junit5 modules.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* CAMEL-24043: Fix incorrect MockEndpoint assertIsSatisfied API usage
Address review feedback: the instance method assertIsSatisfied(long)
parameter is timeoutForEmptyEndpoints, which is silently ignored when
expectedCount > 0. Use setResultWaitTime(30_000) before assertIsSatisfied()
instead. Revert the expectedCount=0 case to no-arg assertIsSatisfied()
to avoid an unnecessary 30-second Thread.sleep.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* CAMEL-24043: Remove verbose comment per review suggestion
Co-Authored-By: Claude Opus 4.6 <[email protected]>
---------
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../flatpack/FixedLengthAllowShortTest.java | 3 +++
.../HazelcastReplicatedmapConsumerTest.java | 6 +++---
.../mail/MailAttachmentDuplicateNamesTest.java | 1 +
.../FilterCreateCamelContextPerClassTest.java | 1 +
.../impl/engine/CamelPostProcessorHelperTest.java | 24 +++++++++++-----------
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git
a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java
b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java
index f18317c97235..58b311d12fca 100644
---
a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java
+++
b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java
@@ -52,6 +52,7 @@ public class FixedLengthAllowShortTest {
@Test
public void testCamel() throws Exception {
results.expectedMessageCount(4);
+ results.setResultWaitTime(30_000);
results.assertIsSatisfied();
int counter = 0;
@@ -70,6 +71,7 @@ public class FixedLengthAllowShortTest {
@Test
public void testFlatpackDataFormat() throws Exception {
resultsdf.expectedMessageCount(1);
+ resultsdf.setResultWaitTime(30_000);
resultsdf.assertIsSatisfied();
Exchange exchange = resultsdf.getReceivedExchanges().get(0);
@@ -84,6 +86,7 @@ public class FixedLengthAllowShortTest {
@Test
public void testFlatpackDataFormatXML() throws Exception {
resultsxml.expectedMessageCount(1);
+ resultsxml.setResultWaitTime(30_000);
resultsxml.assertIsSatisfied();
Exchange exchange = resultsxml.getReceivedExchanges().get(0);
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
index a23991dd4742..140cfd903943 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
@@ -84,7 +84,7 @@ public class HazelcastReplicatedmapConsumerTest extends
CamelTestSupport {
out.expectedMessageCount(1);
map.put("4711", "my-foo");
- MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(),
HazelcastConstants.ADDED);
}
@@ -110,11 +110,11 @@ public class HazelcastReplicatedmapConsumerTest extends
CamelTestSupport {
// Wait for the ADDED event to be fully processed before removing,
// otherwise the remove may execute before the async ADDED event is
delivered.
MockEndpoint added = getMockEndpoint("mock:added");
- Awaitility.await().atMost(5, TimeUnit.SECONDS)
+ Awaitility.await().atMost(10, TimeUnit.SECONDS)
.until(() -> added.getReceivedCounter() >= 1);
map.remove("4711");
- MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(),
HazelcastConstants.REMOVED);
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
index 509d673b90ac..ce3e9a164034 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
@@ -70,6 +70,7 @@ public class MailAttachmentDuplicateNamesTest extends
CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
+ mock.setResultWaitTime(30_000);
mock.assertIsSatisfied();
Exchange out = mock.assertExchangeReceived(0);
diff --git
a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
index e26287ce5add..fa48aed0f176 100644
---
a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
+++
b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
@@ -40,6 +40,7 @@ public class FilterCreateCamelContextPerClassTest extends
CamelTestSupport {
template.sendBodyAndHeader("direct:start", expectedBody, "foo", "bar");
+ endpoint.setResultWaitTime(30_000);
endpoint.assertIsSatisfied();
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java
index 633484c5da11..63b26c88fdad 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java
@@ -107,7 +107,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
template.sendBody("seda:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -138,10 +138,10 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
template.sendBody("seda:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
// give UoW a bit of time
- await("onDone invokation").atMost(1,
TimeUnit.SECONDS).until(mySynchronization::isOnDone);
+ await("onDone invokation").atMost(5,
TimeUnit.SECONDS).until(mySynchronization::isOnDone);
}
@Test
@@ -157,10 +157,10 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
my.produceSomething("Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
// give UoW a bit of time
- await("onDone invocation").atMost(1,
TimeUnit.SECONDS).until(mySynchronization::isOnDone);
+ await("onDone invocation").atMost(5,
TimeUnit.SECONDS).until(mySynchronization::isOnDone);
}
@Test
@@ -185,7 +185,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
assertNotNull(bean.getProducer());
bean.send("Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -214,7 +214,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
bean.send(exchange);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -243,7 +243,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
Exchange exchange = bean.consume();
template.send("mock:result", exchange);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -269,7 +269,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
bean.send(exchange);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -295,7 +295,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
bean.send(exchange);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -321,7 +321,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
bean.send(exchange);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -623,7 +623,7 @@ public class CamelPostProcessorHelperTest extends
ContextTestSupport {
myBean.sendExchange(exchange);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
