You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/05/20 07:07:37 UTC
(camel) branch main updated: CAMEL-20722 - changes to address flakiness observed on CI (#14183)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 a7fb907c620 CAMEL-20722 - changes to address flakiness observed on CI (#14183)
a7fb907c620 is described below
commit a7fb907c6208da1250e224886cbe4df7517ea352
Author: Jang-Vijay Singh <jv...@gmail.com>
AuthorDate: Mon May 20 08:07:30 2024 +0100
CAMEL-20722 - changes to address flakiness observed on CI (#14183)
Changes to address flakiness:
- most likely cause is resource crunch on CI causing some tests to time
out.
- more unique test-specific topic names approach might be needed later
(after observation)
---
.../KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java | 2 +-
.../kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java | 6 +++---
.../KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
index 26cc15816b6..d77bf3b5f85 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
@@ -100,7 +100,7 @@ class KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT extends BaseKafkaTestSup
contextExtension.getContext().getRouteController().startRoute(ROUTE_ID);
Awaitility.await()
- .atMost(10, TimeUnit.SECONDS) // changed to 10 sec for CAMEL-20722
+ .atMost(30, TimeUnit.SECONDS) // changed to 30 sec for CAMEL-20722
.until(() -> to.getExchanges().size() > 3);
to.assertIsSatisfied(3000);
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
index 96ab7c16823..024d6714bcf 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
@@ -51,8 +51,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
disabledReason = "This test does not run reliably on some platforms")
class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport {
- public static final String ROUTE_ID = "breakOnFirstError-20563";
- public static final String TOPIC = "breakOnFirstError-20563";
+ public static final String ROUTE_ID = "breakOnFirstError-20563" + Thread.currentThread().hashCode(); //CAMEL-20722 - added for similar reason as CAMEL-20686:
+ public static final String TOPIC = "breakOnFirstError-20563" + Thread.currentThread().hashCode(); //CAMEL-20722 - added for similar reason as CAMEL-20686:
private static final Logger LOG = LoggerFactory.getLogger(KafkaBreakOnFirstErrorReleaseResourcesIT.class);
private static final int CONSUMER_COUNT = 3;
@@ -106,7 +106,7 @@ class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport {
// let test run for awhile
Awaitility.await()
- .timeout(10, TimeUnit.SECONDS)
+ .timeout(30, TimeUnit.SECONDS) // changed to 30 sec for CAMEL-20722
.pollDelay(8, TimeUnit.SECONDS)
.untilAsserted(() -> assertTrue(true));
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
index e8868264dc9..37d795ec4cd 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
@@ -98,7 +98,7 @@ class KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT extends BaseKafkaT
contextExtension.getContext().getRouteController().startRoute(ROUTE_ID);
Awaitility.await()
- .atMost(10, TimeUnit.SECONDS) // changed to 10 sec for CAMEL-20722
+ .atMost(30, TimeUnit.SECONDS) // changed to 30 sec for CAMEL-20722
.until(() -> errorPayloads.size() > 3);
to.assertIsSatisfied();