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 e46110355fbf chore: camel-core - RouteStopCutOffLog tests must not run
in parallel with each other (#29193)
e46110355fbf is described below
commit e46110355fbfa9f616c213b304f4a53dce13acba
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Nov 5 07:16:41 2026 +0100
chore: camel-core - RouteStopCutOffLog tests must not run in parallel with
each other (#29193)
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---
.../camel/processor/errorhandler/RouteStopCutOffLogNestedTest.java | 3 +++
.../apache/camel/processor/errorhandler/RouteStopCutOffLogTest.java | 3 +++
2 files changed, 6 insertions(+)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogNestedTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogNestedTest.java
index 07782de8bbde..ab9595ea305d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogNestedTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogNestedTest.java
@@ -34,6 +34,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -64,6 +65,8 @@ import static org.junit.jupiter.api.Assertions.fail;
* handlers and the caller's running handler see the flag and skip. The WARN
count is asserted after the exchange
* completes.
*/
+// both RouteStopCutOffLog tests replace and remove the appender of the
DefaultErrorHandler logger
+@ResourceLock("DefaultErrorHandlerLogger")
public class RouteStopCutOffLogNestedTest extends ContextTestSupport {
private static final String LOGGER = DefaultErrorHandler.class.getName();
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogTest.java
index d8075554f11f..69c39f46abd0 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/RouteStopCutOffLogTest.java
@@ -34,6 +34,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -47,6 +48,8 @@ import static org.junit.jupiter.api.Assertions.fail;
* CAMEL-25484: an exchange that a route stop or a dev mode reload cuts off is
logged as one WARN line, not as an
* exhausted failure with message history and stack trace; CAMEL-25502: and is
not recorded in the error registry.
*/
+// both RouteStopCutOffLog tests replace and remove the appender of the
DefaultErrorHandler logger
+@ResourceLock("DefaultErrorHandlerLogger")
public class RouteStopCutOffLogTest extends ContextTestSupport {
private static final String LOGGER = DefaultErrorHandler.class.getName();