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 60377bbae7e CAMEL-20722 - change base class + enable on more CI archs (#14438) 60377bbae7e is described below commit 60377bbae7e9bf62edb1522851a9cf6bf5ea9a4c Author: Jang-Vijay Singh <jvs...@gmail.com> AuthorDate: Mon Jun 10 17:34:41 2024 +0100 CAMEL-20722 - change base class + enable on more CI archs (#14438) - the base class change for test KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT is to get rid of symptom NoSuchElementException - Same reason as PR: https://github.com/apache/camel/pull/14376 --- .../integration/KafkaBreakOnFirstErrorSeekIssueIT.java | 2 +- ...reakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java index 93fb7c4e26f..33db5d1e3c7 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java @@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ @Tags({ @Tag("breakOnFirstError") }) @EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64" }, + architectures = { "amd64", "aarch64", "ppc64le" }, disabledReason = "This test does not run reliably on some platforms") class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport { diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java index 10b96fad61f..045968b41a4 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java @@ -29,13 +29,13 @@ import org.apache.camel.component.kafka.MockConsumerInterceptor; import org.apache.camel.component.kafka.testutil.CamelKafkaUtil; import org.apache.camel.component.mock.MockEndpoint; import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.common.Uuid; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; @@ -49,13 +49,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ @Tags({ @Tag("breakOnFirstError") }) @EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64" }, + architectures = { "amd64", "aarch64", "ppc64le" }, disabledReason = "This test does not run reliably on some platforms") -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "CAMEL-20722: Too unreliable on most of the CI environments") -class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseExclusiveKafkaTestSupport { + +class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchIT"; - public static final String TOPIC = "breakOnFirstErrorBatchIT"; + public static final String TOPIC = "breakOnFirstErrorBatchIT" + Uuid.randomUuid(); private static final Logger LOG = LoggerFactory.getLogger(KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.class); @@ -101,7 +100,8 @@ class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseExclu contextExtension.getContext().getRouteController().startRoute(ROUTE_ID); Awaitility.await() - .atMost(10, TimeUnit.SECONDS) // changed to 10 sec for CAMEL-20722 + .atMost(20, TimeUnit.SECONDS) // changed to 20 sec for CAMEL-20722 + .pollDelay(5, TimeUnit.SECONDS) .until(() -> errorPayloads.size() > 3); to.assertIsSatisfied();