This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8bd05c7d7f87db9dd1b21de368df9f158a3c3103 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Fri Nov 8 09:23:46 2024 +0100 (chores) camel-core: disable broken tests on s390x Disable tests that do not run reliably on s390x --- .../apache/camel/component/controlbus/ControlBusFailRouteTest.java | 3 +++ .../camel/processor/MulticastParallelTimeoutStreamCachingTest.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusFailRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusFailRouteTest.java index 5450a521c49..0c5c7509f3c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusFailRouteTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusFailRouteTest.java @@ -24,10 +24,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.RouteError; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; +@DisabledOnOs(architectures = { "s390x" }, + disabledReason = "This test does not run reliably on s390x") public class ControlBusFailRouteTest extends ContextTestSupport { @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java index 772162fde04..46cacaf43fc 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java @@ -29,13 +29,19 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.converter.stream.CachedOutputStream; 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 = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Github CI") +@DisabledOnOs(architectures = { "s390x" }, + disabledReason = "This test does not run reliably on s390x") public class MulticastParallelTimeoutStreamCachingTest extends ContextTestSupport { private static final String BODY_STRING = "message body"; @@ -52,6 +58,7 @@ public class MulticastParallelTimeoutStreamCachingTest extends ContextTestSuppor assertTrue(f.isDirectory()); Thread.sleep(500L); // deletion happens asynchron File[] files = f.listFiles(); + assertNotNull(files, "There should be a list of files"); assertEquals(0, files.length); }