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 adb520c78704 CAMEL-21438: Re-enable HttpsAsyncRouteTest and
SpringManagedCustomProcessorTest (#23150)
adb520c78704 is described below
commit adb520c78704bf841fa66dbb9c827108bbd56e49
Author: Guillaume Nodet <[email protected]>
AuthorDate: Tue May 12 17:19:45 2026 +0200
CAMEL-21438: Re-enable HttpsAsyncRouteTest and
SpringManagedCustomProcessorTest (#23150)
- Re-enable HttpsAsyncRouteTest (camel-jetty): replace @Disabled with
@Isolated and @EnabledOnOs matching the parent HttpsRouteTest. The
flakiness was caused by missing @Isolated (SSL system property
interference from parallel tests) and overly broad @DisabledOnOs.
- Re-enable SpringManagedCustomProcessorTest (camel-spring-xml): replace
@Disabled("Flaky test") with @DisabledOnOs(OS.AIX) to match the
convention of all 26 other Spring JMX management tests. The original
flakiness from 2020 was resolved by infrastructure improvements.
Both tests verified stable over 100 consecutive iterations (500 total
executions, 0 failures).
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
---
.../org/apache/camel/component/jetty/HttpsAsyncRouteTest.java | 10 ++++++----
.../spring/management/SpringManagedCustomProcessorTest.java | 5 +++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
index 2f08361a4168..2e53b6ab6562 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
@@ -33,10 +33,10 @@ import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
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.Isolated;
import org.junit.jupiter.api.parallel.ResourceLock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,9 +48,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@Isolated
@ResourceLock(SSL_SYSPROPS)
-@DisabledOnOs(OS.WINDOWS)
-@Disabled("Flaky on CI test environments")
+@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD },
+ architectures = { "amd64", "aarch64", "ppc64le" },
+ disabledReason = "This test does not run reliably on multiple
platforms (see CAMEL-21438)")
public class HttpsAsyncRouteTest extends HttpsRouteTest {
private static final Logger LOG =
LoggerFactory.getLogger(HttpsAsyncRouteTest.class);
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
index 11fdc2780fd2..415a38fa67dc 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
@@ -23,8 +23,9 @@ import javax.management.ObjectName;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.spring.SpringTestSupport;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.jmx.export.annotation.ManagedAttribute;
@@ -33,7 +34,7 @@ import
org.springframework.jmx.export.annotation.ManagedResource;
import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@Disabled("Flaky test")
+@DisabledOnOs(OS.AIX)
public class SpringManagedCustomProcessorTest extends SpringTestSupport {
@Override
