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 1882427fcc1 CAMEL-21438: more alt-platforms flakies (#17004) 1882427fcc1 is described below commit 1882427fcc133fc1d1d25e21a329fcc66401c10e Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Fri Jan 31 13:29:59 2025 +0100 CAMEL-21438: more alt-platforms flakies (#17004) * CAMEL-21438: force a timeout for a slow test * (chores) camel-jetty: isolate another set of flaky tests * CAMEL-21438: disable multiple tests that don't run reliably on s390x --- .../java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java | 3 +++ .../java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java | 2 ++ .../camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java | 2 ++ .../test/java/org/apache/camel/component/jetty/HttpsRouteTest.java | 6 ++++-- .../camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java | 3 +++ .../camel/component/rxjava/engine/RxJavaStreamsServiceTest.java | 2 ++ .../apache/camel/impl/LimitedPollingConsumerPollStrategyTest.java | 3 +++ .../apache/camel/processor/resequencer/ResequencerFileNameTest.java | 3 +++ 8 files changed, 22 insertions(+), 2 deletions(-) diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java index 29498a146ab..71767ce77fb 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java @@ -29,6 +29,7 @@ import org.apache.camel.clock.EventClock; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -51,6 +52,8 @@ import static software.amazon.awssdk.services.sqs.model.MessageSystemAttributeNa import static software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName.SEQUENCE_NUMBER; @ExtendWith(MockitoExtension.class) +@DisabledOnOs(architectures = { "s390x" }, + disabledReason = "This test does not run reliably on s390x (see CAMEL-21438)") class Sqs2ConsumerTest extends CamelTestSupport { private AmazonSQSClientMock sqsClientMock; private Sqs2Configuration configuration; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java index bf575841edd..8aa4d03b58a 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java @@ -22,10 +22,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.jsse.KeyManagersParameters; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; +import org.junit.jupiter.api.parallel.Isolated; import org.junit.jupiter.api.parallel.ResourceLock; import static org.apache.camel.component.jetty.BaseJettyTest.SSL_SYSPROPS; +@Isolated @ResourceLock(SSL_SYSPROPS) public class HttpsRouteAliasTest extends HttpsRouteTest { diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java index 8f49970dfe8..f3201f93732 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java @@ -21,10 +21,12 @@ import java.net.URL; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; +import org.junit.jupiter.api.parallel.Isolated; import org.junit.jupiter.api.parallel.ResourceLock; import static org.apache.camel.component.jetty.BaseJettyTest.SSL_SYSPROPS; +@Isolated @ResourceLock(SSL_SYSPROPS) public class HttpsRouteSetupWithSystemPropsTest extends HttpsRouteTest { diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java index ce90afcac32..c8bc7e67156 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java @@ -40,7 +40,7 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.test.junit5.CamelTestSupport; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.parallel.ResourceLock; import org.slf4j.Logger; @@ -54,7 +54,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @ResourceLock(SSL_SYSPROPS) -@DisabledOnOs(value = OS.WINDOWS, disabledReason = "these tests does not run well on Windows") +@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD }, + architectures = { "amd64", "aarch64", "ppc64le" }, + disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)") public class HttpsRouteTest extends BaseJettyTest { public static final String NULL_VALUE_MARKER = CamelTestSupport.class.getCanonicalName(); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java index 3ccf5450c62..9b3907ecaca 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java @@ -22,12 +22,15 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +import org.junit.jupiter.api.condition.DisabledOnOs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*") +@DisabledOnOs(architectures = { "s390x" }, + disabledReason = "This test does not run reliably on s390x (see CAMEL-21438)") public class NettyHttpSSLHandshakeErrorTest extends BaseNettyTest { @Override diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java index 200351bf383..ad460f238d9 100644 --- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java +++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java @@ -32,6 +32,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.ExchangeHelper; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.reactivestreams.Publisher; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -39,6 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +@Timeout(value = 30, unit = TimeUnit.SECONDS) public class RxJavaStreamsServiceTest extends RxJavaStreamsServiceTestSupport { @BindToRegistry("hello") diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategyTest.java index 740589270a4..4b66df6a02f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategyTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategyTest.java @@ -21,9 +21,12 @@ import org.apache.camel.Endpoint; import org.apache.camel.impl.engine.LimitedPollingConsumerPollStrategy; import org.apache.camel.support.service.ServiceHelper; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; import static org.junit.jupiter.api.Assertions.assertTrue; +@DisabledOnOs(architectures = { "s390x" }, + disabledReason = "This test does not run reliably on s390x (see CAMEL-21438)") public class LimitedPollingConsumerPollStrategyTest extends ContextTestSupport { private LimitedPollingConsumerPollStrategy strategy; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java index 7c3b0f8afbe..e8ca67e6cd9 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java @@ -21,7 +21,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +@DisabledOnOs(architectures = { "s390x" }, + disabledReason = "This test does not run reliably on s390x (see CAMEL-21438)") public class ResequencerFileNameTest extends ContextTestSupport { protected MockEndpoint resultEndpoint;