You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/03/18 08:36:19 UTC
[camel] branch master updated: Fixed CI tests
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 606bac6 Fixed CI tests
606bac6 is described below
commit 606bac60ca740bc8c6b63f6f50234979a9f05fcc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 18 09:35:42 2021 +0100
Fixed CI tests
---
.../test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java | 3 +++
.../org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java | 2 ++
2 files changed, 5 insertions(+)
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java
index 41e3d56..5e061d0 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java
@@ -17,12 +17,15 @@
package org.apache.camel.main;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.apache.camel.util.CollectionHelper.mapOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+@Isolated
public class MainPropertyPlaceholderTest {
+
@Test
public void testDefaultPropertyPlaceholderLocationDisabled() {
Main main = new Main();
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java
index 709281f..fb73c0a 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.main;
import java.util.Properties;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.junit.jupiter.api.parallel.ResourceLock;
import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
+@Isolated
@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class MainPropertyPlaceholderWithSystemTest {
@Test