This is an automated email from the ASF dual-hosted git repository. orpiske 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 251bd1ac828 CAMEL-20722: re-enabled tests for CI (#14060) 251bd1ac828 is described below commit 251bd1ac828edbb20621798d9e42b89d3042defe Author: Jang-Vijay Singh <jvs...@gmail.com> AuthorDate: Tue May 7 09:06:20 2024 +0100 CAMEL-20722: re-enabled tests for CI (#14060) * CAMEL-20680: re-enabled tests for CI (#14060) * CAMEL-20722: changed timeout to 10 sec from 3 in KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT * CAMEL-20722 - changed timeout to 10 sec from 3 (sporadic timeout failures on local tests) * CAMEL-20722 + CAMEL-20680 - re-enabled tests for CI * CAMEL-20722 - removed unused imports + minor formatting after mvn verify * CAMEL-20722 - changed thread & topic names to be more unique for a multi-threaded env 1) check more specific thread name to avoid clashes with unrelated kafka heartbeat threads 2) Make topic name from test-full to something more unique less likely to clash with other tests running in parallel --- .../KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java | 4 +--- .../integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java | 9 ++++----- .../kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java | 4 +--- ...KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java | 4 +--- .../KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java | 4 +--- ...aBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java | 4 +--- .../KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java | 4 +--- .../camel/component/kafka/integration/KafkaConsumerFullIT.java | 2 +- 8 files changed, 11 insertions(+), 24 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 6e0bbc9e8e0..51024681ac1 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 @@ -35,7 +35,6 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,8 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * KafkaManualCommit and NOOP Commit Manager */ @Tags({ @Tag("breakOnFirstError") }) -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") + class KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorOff"; public static final String TOPIC = "breakOnFirstErrorOff"; 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 3a1046a2715..1307a84fb00 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 @@ -32,7 +32,6 @@ import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.producer.ProducerRecord; import org.awaitility.Awaitility; import org.junit.jupiter.api.*; -import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,8 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * */ @Tags({ @Tag("breakOnFirstError") }) -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") + class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstError-20563"; @@ -120,8 +118,9 @@ class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport { Set<Thread> threads = Thread.getAllStackTraces().keySet(); int count = 0; - for (Thread t : threads) { - if (t.getName().contains("heartbeat")) { + for (Thread t : threads) { //CAMEL-20722: Look for more specific heartbeat thread, log the full thread name. + if (t.getName().contains("heartbeat") && t.getName().contains("breakOnFirstError-20563")) { + LOG.info(" Thread name: {}", t.getName()); count++; } } 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 f56bfc92354..b6ef60cf3a4 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 @@ -37,7 +37,6 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,8 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * mimics the reproduction of the problem in https://github.com/Krivda/camel-bug-reproduction */ @Tags({ @Tag("breakOnFirstError") }) -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") + class KafkaBreakOnFirstErrorSeekIssueIT extends BaseExclusiveKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstError-19894"; 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 d7fb16d8016..6cf8254609d 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 @@ -35,7 +35,6 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,8 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * Camel to handle when to commit an offset */ @Tags({ @Tag("breakOnFirstError") }) -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") + class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseExclusiveKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchIT"; public static final String TOPIC = "breakOnFirstErrorBatchIT"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java index 88b8a5fbb3b..dcbdb14d27f 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java @@ -35,7 +35,6 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,8 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * Camel default to use NOOP Commit Manager this means the route implementation MUST manage all offset commits */ @Tags({ @Tag("breakOnFirstError") }) -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") + class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchOnExceptionIT"; public static final String TOPIC = "breakOnFirstErrorBatchOnExceptionIT"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java index fb250ab972a..eced5d9cbcf 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java @@ -35,7 +35,6 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,8 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * will demonstrate how to retry */ @Tags({ @Tag("breakOnFirstError") }) -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") + class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchRetryIT"; 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 8ac1817eec1..e13ef03cb72 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 @@ -35,7 +35,6 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,8 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * Camel to handle when to commit an offset */ @Tags({ @Tag("breakOnFirstError") }) -@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") + class KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchITSyncCommitManager"; public static final String TOPIC = "breakOnFirstErrorBatchITSyncCommitManager"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java index ef2a3b33b12..9398f17a35d 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java @@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class KafkaConsumerFullIT extends BaseKafkaTestSupport { - public static final String TOPIC = "test-full"; + public static final String TOPIC = "test-full-KafkaConsumerFullIT"; //CAMEL-20722: try a more unique name to avoid clash private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerFullIT.class);