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
commit fb96a8918086de361c6ad86dd0f324d75306ce4d Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Wed Jun 7 17:08:45 2023 +0200 (chores) camel-core: isolate a few misbehaved tests on s390x --- .../camel/component/file/FileConcurrentWriteAppendSameFileTest.java | 2 ++ .../apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java | 2 ++ .../src/test/java/org/apache/camel/converter/FutureConverterTest.java | 2 ++ .../org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java | 2 ++ .../java/org/apache/camel/impl/ScheduledPollConsumerBackoffTest.java | 2 ++ .../test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java | 2 ++ .../RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java | 2 ++ .../test/java/org/apache/camel/processor/ThrottlingGroupingTest.java | 2 ++ .../org/apache/camel/processor/aggregator/AggregateProcessorTest.java | 2 ++ .../apache/camel/processor/resequencer/ResequencerBatchOrderTest.java | 2 ++ 10 files changed, 20 insertions(+) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java index 04a3eed8283..726b1eb8cf3 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java @@ -31,12 +31,14 @@ import org.apache.camel.component.mock.MockEndpoint; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +@Isolated public class FileConcurrentWriteAppendSameFileTest extends ContextTestSupport { private static final Logger LOG = LoggerFactory.getLogger(FileConcurrentWriteAppendSameFileTest.class); diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java index 04607f5fbdf..9f85da59eb4 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java @@ -24,12 +24,14 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ +@Isolated class FileProducerCharsetUTFtoUTFTest extends ContextTestSupport { private static final String DATA = "ABC\u00e6"; diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/FutureConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/FutureConverterTest.java index 671383b281f..070eb8b66b9 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/FutureConverterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/FutureConverterTest.java @@ -25,9 +25,11 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.DefaultExchange; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.*; +@Isolated public class FutureConverterTest extends ContextTestSupport { @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java index 048d095b60c..a2d58440153 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java @@ -21,11 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertTrue; +@Isolated public class TimerDrivenTimePatternConverterTest extends ContextTestSupport { private static final Logger LOG = LoggerFactory.getLogger(TimerDrivenTimePatternConverterTest.class); diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerBackoffTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerBackoffTest.java index a57316c6a7f..7eb4832453b 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerBackoffTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerBackoffTest.java @@ -22,10 +22,12 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.PollingConsumerPollStrategy; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Github CI") +@Isolated public class ScheduledPollConsumerBackoffTest extends ContextTestSupport { private static int commits; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java index d232e00316c..21429a21f7f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/ConsumerRouteIdAwareTest.java @@ -31,7 +31,9 @@ import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.DefaultConsumer; import org.apache.camel.support.DefaultEndpoint; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; +@Isolated public class ConsumerRouteIdAwareTest extends ContextTestSupport { @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java index 98a1ae5c901..d9f0ee6aca1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java @@ -25,9 +25,11 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.assertTrue; +@Isolated public class RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest extends ContextTestSupport { private final AtomicInteger counter = new AtomicInteger(); diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java index 0c10297801b..d030cffb74e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java @@ -26,9 +26,11 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.assertTrue; +@Isolated public class ThrottlingGroupingTest extends ContextTestSupport { private static final int INTERVAL = 500; private static final int MESSAGE_COUNT = 9; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateProcessorTest.java index 7533d4017d9..07d87a103ab 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateProcessorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateProcessorTest.java @@ -37,10 +37,12 @@ import org.apache.camel.support.DefaultExchange; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.*; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Github CI") +@Isolated public class AggregateProcessorTest extends ContextTestSupport { private ExecutorService executorService; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java index c74a65aa653..2f00024b4bd 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java @@ -20,11 +20,13 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertTrue; +@Isolated public class ResequencerBatchOrderTest extends ContextTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ResequencerBatchOrderTest.class);
