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 b5dcef0fda6 camel-core - Isolate some tests that are flaky on CI
(#14156)
b5dcef0fda6 is described below
commit b5dcef0fda6b91d8db409c04c9f3544c10761ce9
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed May 15 14:04:38 2024 +0200
camel-core - Isolate some tests that are flaky on CI (#14156)
---
.../test/java/org/apache/camel/support/jsse/FilterParametersTest.java | 2 ++
.../java/org/apache/camel/support/jsse/KeyManagersParametersTest.java | 4 +++-
.../java/org/apache/camel/support/jsse/KeyStoreParametersTest.java | 2 +-
.../java/org/apache/camel/support/jsse/SSLContextParametersTest.java | 4 +++-
.../org/apache/camel/support/jsse/SecureRandomParametersTest.java | 2 ++
.../org/apache/camel/support/jsse/TrustManagersParametersTest.java | 4 +++-
.../src/test/resources/org/apache/camel/support/jsse/test.properties | 2 +-
7 files changed, 15 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
index 1d3754b6154..aaabdc92c2f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
@@ -22,9 +22,11 @@ import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class FilterParametersTest extends AbstractJsseParametersTest {
@Test
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
index 6187b4b6396..35faf6a5779 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
@@ -27,9 +27,11 @@ import javax.net.ssl.X509KeyManager;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class KeyManagersParametersTest extends AbstractJsseParametersTest {
protected KeyStoreParameters createMinimalKeyStoreParameters() {
@@ -63,7 +65,7 @@ public class KeyManagersParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
- ksp.setPassword("{{keyStoreParamerers.password}}");
+ ksp.setPassword("{{keyStoreParameters.password}}");
KeyManagersParameters kmp = new KeyManagersParameters();
kmp.setCamelContext(context);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
index 11e83a1ee4c..fae068e7b8e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
@@ -56,7 +56,7 @@ public class KeyStoreParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
- ksp.setPassword("{{keyStoreParamerers.password}}");
+ ksp.setPassword("{{keyStoreParameters.password}}");
KeyStore ks = ksp.createKeyStore();
assertNotNull(ks.getCertificate("localhost"));
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
index 9971e981646..cdbe21a823c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
@@ -30,9 +30,11 @@ import javax.net.ssl.SSLSocket;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class SSLContextParametersTest extends AbstractJsseParametersTest {
@Test
@@ -68,7 +70,7 @@ public class SSLContextParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
- ksp.setPassword("{{keyStoreParamerers.password}}");
+ ksp.setPassword("{{keyStoreParameters.password}}");
KeyManagersParameters kmp = new KeyManagersParameters();
kmp.setCamelContext(camelContext);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java
index d2bad2472c0..fa6ebbfd683 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java
@@ -22,10 +22,12 @@ import java.security.SecureRandom;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+@Isolated("This test is regularly flaky")
public class SecureRandomParametersTest extends AbstractJsseParametersTest {
@Test
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java
index aa14ad347aa..95ca1c298b7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java
@@ -28,10 +28,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com",
disabledReason = "Flaky on Github CI")
+@Isolated("This test is regularly flaky")
public class TrustManagersParametersTest extends AbstractJsseParametersTest {
protected KeyStoreParameters createMinimalKeyStoreParameters() {
@@ -61,7 +63,7 @@ public class TrustManagersParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
- ksp.setPassword("{{keyStoreParamerers.password}}");
+ ksp.setPassword("{{keyStoreParameters.password}}");
TrustManagersParameters tmp = new TrustManagersParameters();
tmp.setCamelContext(context);
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties
b/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties
index e4ce2e4e662..3979a5f9a14 100644
---
a/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties
+++
b/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties
@@ -18,7 +18,7 @@ filterParameters.include=include
filterParameters.exclude=exclude
keyStoreParameters.resource=org/apache/camel/support/jsse/localhost.p12
-keyStoreParamerers.password=changeit
+keyStoreParameters.password=changeit
keyManagersParameters.keyPassword=changeit
