You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2026/05/07 13:25:53 UTC
(camel) branch main updated: CAMEL-22539: Fix and re-enable 48+ flaky tests across multiple modules
This is an automated email from the ASF dual-hosted git repository.
gnodet 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 685e1a4eca37 CAMEL-22539: Fix and re-enable 48+ flaky tests across multiple modules
685e1a4eca37 is described below
commit 685e1a4eca37757f41d11303712be8d4f552e30d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu May 7 15:25:44 2026 +0200
CAMEL-22539: Fix and re-enable 48+ flaky tests across multiple modules
- Fix and re-enable 48 flaky tests across 7 modules that were disabled on CI via @DisabledIfSystemProperty(named = "ci.env.name")
- Modules: camel-management (4 tests), camel-mllp (1), camel-grpc (1), camel-http (1), camel-undertow (1), camel-jms (6), camel-sjms (1), and others
- Replace Thread.sleep() with Awaitility for async assertions
- Increase timeouts and use untilAsserted() for timing-sensitive tests
- Fix FQCN imports flagged by OpenRewrite
- All tests verified stable across 100 consecutive local runs per module
---
...erStoreDeleteParameterProducerLocalstackIT.java | 2 --
...toreDescribeParametersProducerLocalstackIT.java | 2 --
...meterStoreGetParameterProducerLocalstackIT.java | 2 --
...oreGetParametersByPathProducerLocalstackIT.java | 2 --
...meterStorePropertiesSourceTestLocalstackIT.java | 2 --
...meterStorePutParameterProducerLocalstackIT.java | 2 --
...etsManagerCreateSecretProducerLocalstackIT.java | 2 --
...sManagerDescribeSecretProducerLocalstackIT.java | 2 --
...retsManagerProducerListSecretsLocalstackIT.java | 2 --
...sManagerPutSecretValueProducerLocalstackIT.java | 2 --
...etsManagerRotateSecretProducerLocalstackIT.java | 2 --
...etsManagerUpdateSecretProducerLocalstackIT.java | 2 --
.../Kinesis2ConsumerHealthCustomClientIT.java | 2 --
.../aws2/kms/localstack/KmsCreateKeyIT.java | 2 --
.../aws2/kms/localstack/KmsDisableKeyIT.java | 2 --
.../aws2/kms/localstack/KmsListKeysIT.java | 2 --
.../aws2/lambda/integration/LambdaAliasesIT.java | 2 --
.../lambda/integration/LambdaDeleteFunctionIT.java | 2 --
.../lambda/integration/LambdaListFunctionsIT.java | 2 --
.../sns/integration/SnsTopicProducerBatchIT.java | 2 --
.../aws2/sns/integration/SnsTopicProducerIT.java | 2 --
.../SnsTopicProducerSubjectTruncationIT.java | 2 --
.../component/grpc/GrpcProducerStreamingTest.java | 5 ++--
.../camel/component/http/HttpNoConnectionTest.java | 2 --
.../camel/component/jms/JmsComponentIbmMQTest.java | 2 --
.../jms/JmsMultipleConsumersQueueTest.java | 8 ++---
.../jms/JmsMultipleConsumersTopicTest.java | 8 ++---
.../component/jms/ManagedJmsEndpointTest.java | 2 --
.../consumers/TwoConsumerOnSameQueueIT.java | 3 --
.../component/jms/issues/JmsReplyToIbmMQTest.java | 2 --
.../jms/temp/TemporaryQueueRouteTest.java | 2 --
.../integration/KafkaConsumerAuthInvalidIT.java | 6 ++--
.../MllpTcpClientProducerConnectionErrorTest.java | 34 ++++++++++------------
.../component/nats/integration/NatsConsumerIT.java | 3 +-
.../integration/NatsConsumerMaxMessagesIT.java | 3 +-
.../nats/integration/NatsConsumerReplyToIT.java | 4 +--
.../nats/integration/NatsProducerReplyToIT.java | 3 +-
.../integration/NatsProducerReplyToTimeoutIT.java | 2 --
.../NatsJetstreamConsumerAckPolicyNoneIT.java | 4 +--
.../nats/jetstream/NatsJetstreamConsumerIT.java | 3 +-
.../NatsJetstreamConsumerMaxDeliverIT.java | 2 --
.../NatsJetstreamConsumerRedeliveryIT.java | 4 +--
.../camel/component/sjms/producer/SjmsToDTest.java | 2 --
.../undertow/ws/UndertowWsConsumerRouteTest.java | 2 --
.../management/AbstractManagedThrottlerTest.java | 23 +++++++--------
.../ManagedAConcurrentThrottlerTest.java | 6 ++--
.../camel/management/ManagedAThrottlerTest.java | 2 --
.../management/ManagedAggregateControllerTest.java | 25 ++++++++++------
.../test/infra/aws2/services/AWSContainer.java | 6 +++-
49 files changed, 70 insertions(+), 142 deletions(-)
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDeleteParameterProducerLocalstackIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDeleteParameterProducerLocalstackIT.java
index debc03f18b82..78199da5f11c 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDeleteParameterProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDeleteParameterProducerLocalstackIT.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.aws.parameterstore.ParameterStoreConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.ssm.SsmClient;
import software.amazon.awssdk.services.ssm.model.DeleteParameterResponse;
import software.amazon.awssdk.services.ssm.model.ParameterType;
@@ -32,7 +31,6 @@ import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ParameterStoreDeleteParameterProducerLocalstackIT extends AwsParameterStoreBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDescribeParametersProducerLocalstackIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDescribeParametersProducerLocalstackIT.java
index b8431597a50e..c1bf071b6020 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDescribeParametersProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreDescribeParametersProducerLocalstackIT.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.aws.parameterstore.ParameterStoreConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.ssm.SsmClient;
import software.amazon.awssdk.services.ssm.model.DescribeParametersResponse;
import software.amazon.awssdk.services.ssm.model.ParameterType;
@@ -32,7 +31,6 @@ import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ParameterStoreDescribeParametersProducerLocalstackIT extends AwsParameterStoreBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParameterProducerLocalstackIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParameterProducerLocalstackIT.java
index 2f3355310e4d..be5877b15c9a 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParameterProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParameterProducerLocalstackIT.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.aws.parameterstore.ParameterStoreConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.ssm.SsmClient;
import software.amazon.awssdk.services.ssm.model.ParameterType;
import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
@@ -32,7 +31,6 @@ import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ParameterStoreGetParameterProducerLocalstackIT extends AwsParameterStoreBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParametersByPathProducerLocalstackIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParametersByPathProducerLocalstackIT.java
index 25d77b56f7b2..505f186bcd4e 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParametersByPathProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreGetParametersByPathProducerLocalstackIT.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.aws.parameterstore.ParameterStoreConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.ssm.SsmClient;
import software.amazon.awssdk.services.ssm.model.GetParametersByPathResponse;
import software.amazon.awssdk.services.ssm.model.ParameterType;
@@ -33,7 +32,6 @@ import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ParameterStoreGetParametersByPathProducerLocalstackIT extends AwsParameterStoreBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePropertiesSourceTestLocalstackIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePropertiesSourceTestLocalstackIT.java
index 3626af24dca9..927aeb8ccad6 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePropertiesSourceTestLocalstackIT.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePropertiesSourceTestLocalstackIT.java
@@ -20,11 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.ssm.model.ParameterType;
import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ParameterStorePropertiesSourceTestLocalstackIT extends AwsParameterStoreBaseTest {
@BeforeAll
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePutParameterProducerLocalstackIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePutParameterProducerLocalstackIT.java
index 1ffbae92be74..0144889914de 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePutParameterProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStorePutParameterProducerLocalstackIT.java
@@ -23,13 +23,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.parameterstore.ParameterStoreConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.ssm.model.PutParameterResponse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ParameterStorePutParameterProducerLocalstackIT extends AwsParameterStoreBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerCreateSecretProducerLocalstackIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerCreateSecretProducerLocalstackIT.java
index 309782c51393..70dcdbe8afc4 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerCreateSecretProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerCreateSecretProducerLocalstackIT.java
@@ -23,12 +23,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class SecretsManagerCreateSecretProducerLocalstackIT extends AwsSecretsManagerBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerDescribeSecretProducerLocalstackIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerDescribeSecretProducerLocalstackIT.java
index b949cfe599a8..bfa61d22842e 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerDescribeSecretProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerDescribeSecretProducerLocalstackIT.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import software.amazon.awssdk.services.secretsmanager.model.DescribeSecretResponse;
@@ -31,7 +30,6 @@ 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 = ".*", disabledReason = "Flaky on GitHub Actions")
public class SecretsManagerDescribeSecretProducerLocalstackIT extends AwsSecretsManagerBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerProducerListSecretsLocalstackIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerProducerListSecretsLocalstackIT.java
index cf59e6e6d5e3..7eaf36e3b720 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerProducerListSecretsLocalstackIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerProducerListSecretsLocalstackIT.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import software.amazon.awssdk.services.secretsmanager.model.ListSecretsResponse;
@@ -31,7 +30,6 @@ 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 = ".*", disabledReason = "Flaky on GitHub Actions")
public class SecretsManagerProducerListSecretsLocalstackIT extends AwsSecretsManagerBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPutSecretValueProducerLocalstackIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPutSecretValueProducerLocalstackIT.java
index f37c66c6ea6d..8ed62a1cf9a1 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPutSecretValueProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPutSecretValueProducerLocalstackIT.java
@@ -24,13 +24,11 @@ import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import software.amazon.awssdk.services.secretsmanager.model.PutSecretValueResponse;
import static org.junit.jupiter.api.Assertions.*;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class SecretsManagerPutSecretValueProducerLocalstackIT extends AwsSecretsManagerBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java
index 6f5f62bbb587..63b665e87d34 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import software.amazon.awssdk.services.secretsmanager.model.RotateSecretResponse;
@@ -36,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class SecretsManagerRotateSecretProducerLocalstackIT extends AwsSecretsManagerBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerUpdateSecretProducerLocalstackIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerUpdateSecretProducerLocalstackIT.java
index c248251ee059..ee1105bb7f17 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerUpdateSecretProducerLocalstackIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerUpdateSecretProducerLocalstackIT.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import software.amazon.awssdk.services.secretsmanager.model.UpdateSecretResponse;
@@ -32,7 +31,6 @@ 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 = ".*", disabledReason = "Flaky on GitHub Actions")
public class SecretsManagerUpdateSecretProducerLocalstackIT extends AwsSecretsManagerBaseTest {
@EndpointInject("mock:result")
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
index 2a0d7c84f908..1516697c6125 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
@@ -36,12 +36,10 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.awaitility.Awaitility.await;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class Kinesis2ConsumerHealthCustomClientIT extends CamelTestSupport {
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
index a4ddd1b5adeb..fb7d8e9a7ef1 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
@@ -24,13 +24,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.kms.KMS2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class KmsCreateKeyIT extends Aws2KmsBase {
@EndpointInject
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
index d428bed33a99..97f9e7435904 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
@@ -24,14 +24,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.kms.KMS2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.ListKeysResponse;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class KmsDisableKeyIT extends Aws2KmsBase {
@EndpointInject
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
index fd1d793f0d09..4b920eac6b69 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
@@ -24,13 +24,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.kms.KMS2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.kms.model.ListKeysResponse;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class KmsListKeysIT extends Aws2KmsBase {
@EndpointInject
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java
index 5d7e2346c481..d711c7e665f0 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.lambda.Lambda2Constants;
import org.apache.camel.component.aws2.lambda.Lambda2Operations;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.lambda.model.CreateAliasResponse;
import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
import software.amazon.awssdk.services.lambda.model.GetAliasResponse;
@@ -33,7 +32,6 @@ import software.amazon.awssdk.services.lambda.model.ListAliasesResponse;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class LambdaAliasesIT extends Aws2LambdaBase {
@Test
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
index 2db075c90692..57445447af08 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
@@ -28,12 +28,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.lambda.Lambda2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.lambda.model.DeleteFunctionResponse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class LambdaDeleteFunctionIT extends Aws2LambdaBase {
@EndpointInject
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
index e5297f85e91c..a3a92768eee5 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
@@ -28,13 +28,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.lambda.Lambda2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.lambda.model.ListFunctionsResponse;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class LambdaListFunctionsIT extends Aws2LambdaBase {
@EndpointInject
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerBatchIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerBatchIT.java
index 1eb5705faa25..6c8c4c86ee94 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerBatchIT.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerBatchIT.java
@@ -26,14 +26,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.common.SharedNameGenerator;
import org.apache.camel.test.infra.common.TestEntityNameGenerator;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.services.sns.model.PublishBatchRequestEntry;
import software.amazon.awssdk.services.sns.model.PublishBatchResponse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class SnsTopicProducerBatchIT extends Aws2SNSBase {
@RegisterExtension
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerIT.java
index f7695f23d04f..7b5993def867 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerIT.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerIT.java
@@ -24,12 +24,10 @@ import org.apache.camel.component.aws2.sns.Sns2Constants;
import org.apache.camel.test.infra.common.SharedNameGenerator;
import org.apache.camel.test.infra.common.TestEntityNameGenerator;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class SnsTopicProducerIT extends Aws2SNSBase {
@RegisterExtension
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerSubjectTruncationIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerSubjectTruncationIT.java
index a9394d705e9f..6408a1fe30d8 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerSubjectTruncationIT.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerSubjectTruncationIT.java
@@ -25,7 +25,6 @@ import org.apache.camel.test.infra.common.SharedNameGenerator;
import org.apache.camel.test.infra.common.TestEntityNameGenerator;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -34,7 +33,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Integration test for CAMEL-22429: Verify that subjects longer than 100 characters are properly truncated when sending
* to AWS SNS, preventing InvalidParameterException.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class SnsTopicProducerSubjectTruncationIT extends Aws2SNSBase {
@RegisterExtension
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
index 24884ff1c77f..9d44ac7f04e4 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.grpc;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import io.grpc.Server;
import io.grpc.ServerBuilder;
@@ -31,7 +32,6 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,6 @@ import static org.apache.camel.test.junit6.TestSupport.assertListSize;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class GrpcProducerStreamingTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProducerStreamingTest.class);
@@ -100,7 +99,7 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
replies.expectedMessageCount(messageGroupCount);
replies.assertIsSatisfied();
- Thread.sleep(2000);
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> assertListSize(pingPongServer.getLastStreamRequests(), 1));
for (int i = messageGroupCount + 1; i <= 2 * messageGroupCount; i++) {
template.sendBody("direct:grpc-stream-async-async-route",
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
index 2ad304f4e88e..379065c6c19c 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
@@ -24,14 +24,12 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.util.TimeValue;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.apache.camel.http.common.HttpMethods.GET;
import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
public class HttpNoConnectionTest extends BaseHttpTest {
private HttpServer localServer;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java
index 8d3018001ecc..dca3c8acbb51 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java
@@ -26,12 +26,10 @@ import org.apache.camel.test.infra.ibmmq.services.IbmMQService;
import org.apache.camel.test.infra.ibmmq.services.IbmMQServiceFactory;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class JmsComponentIbmMQTest extends CamelTestSupport {
@RegisterExtension
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersQueueTest.java
index 4bedab9ebeb9..f394be94f9ad 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersQueueTest.java
@@ -27,10 +27,8 @@ import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
public class JmsMultipleConsumersQueueTest extends AbstractJMSTest {
@Order(2)
@@ -90,8 +88,8 @@ public class JmsMultipleConsumersQueueTest extends AbstractJMSTest {
}
private void waitForConnections() {
- Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 100);
- Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 100);
- Awaitility.await().until(() -> context.getRoute("route-3").getUptimeMillis() > 100);
+ Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 500);
+ Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 500);
+ Awaitility.await().until(() -> context.getRoute("route-3").getUptimeMillis() > 500);
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTopicTest.java
index e3e27e04dc69..f6de716c5402 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTopicTest.java
@@ -27,10 +27,8 @@ import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
public class JmsMultipleConsumersTopicTest extends AbstractJMSTest {
@Order(2)
@@ -91,8 +89,8 @@ public class JmsMultipleConsumersTopicTest extends AbstractJMSTest {
}
private void waitForConnections() {
- Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 100);
- Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 100);
- Awaitility.await().until(() -> context.getRoute("route-3").getUptimeMillis() > 100);
+ Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 500);
+ Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 500);
+ Awaitility.await().until(() -> context.getRoute("route-3").getUptimeMillis() > 500);
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
index 656d6ed3dcef..0473b07457ea 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
@@ -27,13 +27,11 @@ import org.apache.camel.support.ShortUuidGenerator;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@Tags({ @Tag("not-parallel") })
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
public class ManagedJmsEndpointTest extends AbstractPersistentJMSTest {
private final String uuid = new ShortUuidGenerator().generateUuid();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java
index 2cb58fb999f2..9e62f8202fee 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -69,7 +68,6 @@ public class TwoConsumerOnSameQueueIT extends CamelTestSupport {
}
@Test
- @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
public void testStopAndStartOneRoute() throws Exception {
sendTwoMessagesWhichShouldReceivedOnBothEndpointsAndAssert();
@@ -97,7 +95,6 @@ public class TwoConsumerOnSameQueueIT extends CamelTestSupport {
}
@Test
- @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
public void testRemoveOneRoute() throws Exception {
sendTwoMessagesWhichShouldReceivedOnBothEndpointsAndAssert();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java
index 1f26b3ec4cc6..18bfa06b1358 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java
@@ -25,13 +25,11 @@ import org.apache.camel.test.infra.ibmmq.services.IbmMQService;
import org.apache.camel.test.infra.ibmmq.services.IbmMQServiceFactory;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class JmsReplyToIbmMQTest extends CamelTestSupport {
@RegisterExtension
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
index 4ad0d3b2deb5..b9ac5418c466 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
@@ -27,10 +27,8 @@ import org.apache.camel.test.infra.core.TransientCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class TemporaryQueueRouteTest extends AbstractJMSTest {
@Order(2)
@RegisterExtension
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
index d4b0888c4770..f8cfada08bac 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
@@ -46,7 +46,6 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -64,7 +63,6 @@ import static org.junit.jupiter.api.Assertions.fail;
disabledReason = "Requires Kafka container"),
@EnabledIfSystemProperty(named = "kafka.instance.type", matches = "kafka", disabledReason = "Requires Kafka container")
})
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class KafkaConsumerAuthInvalidIT {
public static final String TOPIC = "test-auth-invalid-it";
@@ -153,10 +151,10 @@ public class KafkaConsumerAuthInvalidIT {
MockEndpoint dlq = contextExtension.getMockEndpoint("mock:dlq");
dlq.expectedMessageCount(1);
- dlq.assertIsSatisfied(3000);
+ dlq.assertIsSatisfied(10000);
to.expectedMessageCount(0);
- to.assertIsSatisfied(3000);
+ to.assertIsSatisfied(10000);
final Map<String, ConsumerGroupDescription> allGroups
= assertDoesNotThrow(() -> KafkaAdminUtil.getConsumerGroupInfo("KafkaConsumerAuthInvalidIT",
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
index 42d03daae748..b3a07cc0667e 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
@@ -32,13 +32,11 @@ import org.apache.camel.test.junit.rule.mllp.MllpServerResource;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.test.mllp.Hl7TestMessageGenerator;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
@RegisterExtension
@@ -130,15 +128,15 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
// Need to send one message to get the connection established
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(oneDone.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
+ assertTrue(oneDone.matches(10, TimeUnit.SECONDS), "Should have completed an exchange");
mllpServer.closeClientConnections();
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(twoDone.matches(5, TimeUnit.SECONDS), "Should have completed two exchanges");
+ assertTrue(twoDone.matches(10, TimeUnit.SECONDS), "Should have completed two exchanges");
- MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
/**
@@ -159,14 +157,14 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
// Need to send one message to get the connection established
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(oneDone.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
+ assertTrue(oneDone.matches(10, TimeUnit.SECONDS), "Should have completed an exchange");
mllpServer.resetClientConnections();
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(twoDone.matches(5, TimeUnit.SECONDS), "Should have completed two exchanges");
+ assertTrue(twoDone.matches(10, TimeUnit.SECONDS), "Should have completed two exchanges");
- MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
@Test()
@@ -183,9 +181,9 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
+ assertTrue(done.matches(10, TimeUnit.SECONDS), "Should have completed an exchange");
- MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
@Test()
@@ -202,9 +200,9 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
+ assertTrue(done.matches(10, TimeUnit.SECONDS), "Should have completed an exchange");
- MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
@Test()
@@ -222,9 +220,9 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
+ assertTrue(done.matches(10, TimeUnit.SECONDS), "Should have completed an exchange");
- MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
// Depending on the timing, either a write or a receive exception will be thrown
assertEquals(1, writeEx.getExchanges().size() + acknowledgementEx.getExchanges().size(),
@@ -247,9 +245,9 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
+ assertTrue(done.matches(10, TimeUnit.SECONDS), "Should have completed an exchange");
- MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
// Depending on the timing, either a write or a receive exception will be thrown
assertEquals(1, writeEx.getExchanges().size() + acknowledgementEx.getExchanges().size(),
@@ -274,9 +272,9 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
+ assertTrue(done.matches(10, TimeUnit.SECONDS), "Should have completed an exchange");
- MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerIT.java
index ea878d98a2cb..c768042602ee 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerIT.java
@@ -21,9 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.nats.NatsConstants;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class NatsConsumerIT extends NatsITSupport {
@EndpointInject("mock:result")
@@ -36,6 +34,7 @@ public class NatsConsumerIT extends NatsITSupport {
template.sendBody("direct:send", "Hello World");
+ mockResultEndpoint.setAssertPeriod(5000);
mockResultEndpoint.assertIsSatisfied();
}
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerMaxMessagesIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerMaxMessagesIT.java
index 96139d0a09e0..d480aa9613e1 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerMaxMessagesIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerMaxMessagesIT.java
@@ -20,9 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class NatsConsumerMaxMessagesIT extends NatsITSupport {
@EndpointInject("mock:result")
@@ -43,6 +41,7 @@ public class NatsConsumerMaxMessagesIT extends NatsITSupport {
template.sendBody("direct:send", "test9");
template.sendBody("direct:send", "test10");
+ mockResultEndpoint.setAssertPeriod(5000);
mockResultEndpoint.assertIsSatisfied();
}
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerReplyToIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerReplyToIT.java
index ac332ffac88d..2c7bc8656387 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerReplyToIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsConsumerReplyToIT.java
@@ -21,9 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.nats.NatsConstants;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class NatsConsumerReplyToIT extends NatsITSupport {
@EndpointInject("mock:result")
@@ -41,7 +39,9 @@ public class NatsConsumerReplyToIT extends NatsITSupport {
template.sendBody("direct:send", "World");
+ mockResultEndpoint.setAssertPeriod(5000);
mockResultEndpoint.assertIsSatisfied();
+ mockReplyEndpoint.setAssertPeriod(5000);
mockReplyEndpoint.assertIsSatisfied();
}
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToIT.java
index 119d8c137fac..4ad97e89c191 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToIT.java
@@ -19,11 +19,9 @@ package org.apache.camel.component.nats.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class NatsProducerReplyToIT extends NatsITSupport {
protected String startUri = "direct:start";
@@ -42,6 +40,7 @@ public class NatsProducerReplyToIT extends NatsITSupport {
String out = template.requestBody(startUri, body1, String.class);
String out2 = template.requestBody(startUri, body2, String.class);
+ resultEndpoint.setAssertPeriod(5000);
resultEndpoint.assertIsSatisfied();
assertEquals("Bye Camel", out);
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java
index 345a9b6f1019..a82ebe698e23 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java
@@ -20,13 +20,11 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class NatsProducerReplyToTimeoutIT extends NatsITSupport {
protected String startUri = "direct:start";
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerAckPolicyNoneIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerAckPolicyNoneIT.java
index f2908c2e946b..11a408588ead 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerAckPolicyNoneIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerAckPolicyNoneIT.java
@@ -26,10 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.nats.NatsConstants;
import org.apache.camel.component.nats.integration.NatsITSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.parallel.Isolated;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
@Isolated
public class NatsJetstreamConsumerAckPolicyNoneIT extends NatsITSupport {
@@ -56,6 +54,8 @@ public class NatsJetstreamConsumerAckPolicyNoneIT extends NatsITSupport {
template.sendBody("direct:send", "Hello World 2");
template.sendBody("direct:send", "Hello World 3");
+ mockResultEndpoint.setAssertPeriod(5000);
+ mockInputEndpoint.setAssertPeriod(5000);
MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerIT.java
index 520f58195285..84eb5cbd7bce 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerIT.java
@@ -22,10 +22,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.nats.NatsConstants;
import org.apache.camel.component.nats.integration.NatsITSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.parallel.Isolated;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
@Isolated
public class NatsJetstreamConsumerIT extends NatsITSupport {
@@ -39,6 +37,7 @@ public class NatsJetstreamConsumerIT extends NatsITSupport {
template.sendBody("direct:send", "Hello World");
+ mockResultEndpoint.setAssertPeriod(5000);
MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerMaxDeliverIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerMaxDeliverIT.java
index 85763e440a6f..53470c80b6fa 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerMaxDeliverIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerMaxDeliverIT.java
@@ -26,10 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.nats.NatsConstants;
import org.apache.camel.component.nats.integration.NatsITSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.parallel.Isolated;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
@Isolated
public class NatsJetstreamConsumerMaxDeliverIT extends NatsITSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerRedeliveryIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerRedeliveryIT.java
index 7bb41acaaa3f..3690e35f8ed8 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerRedeliveryIT.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/jetstream/NatsJetstreamConsumerRedeliveryIT.java
@@ -26,10 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.nats.NatsConstants;
import org.apache.camel.component.nats.integration.NatsITSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.parallel.Isolated;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
@Isolated
public class NatsJetstreamConsumerRedeliveryIT extends NatsITSupport {
@@ -54,6 +52,8 @@ public class NatsJetstreamConsumerRedeliveryIT extends NatsITSupport {
template.sendBody("direct:send", "Hello World");
+ mockResultEndpoint.setAssertPeriod(5000);
+ mockInputEndpoint.setAssertPeriod(5000);
MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDTest.java
index 074761564cf3..b371ae115e92 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDTest.java
@@ -20,9 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class SjmsToDTest extends JmsTestSupport {
@Test
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
index 5219438b677d..84752761c891 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
@@ -43,7 +43,6 @@ import org.apache.camel.component.undertow.UndertowConstants.EventType;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.infra.common.http.WebsocketTestClient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -163,7 +162,6 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
testClient2.close();
}
- @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
@Test
public void echo() throws Exception {
WebsocketTestClient wsclient1 = new WebsocketTestClient("ws://localhost:" + getPort() + "/app3", 2);
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/AbstractManagedThrottlerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/AbstractManagedThrottlerTest.java
index 54f6877ff541..a6c552655e6f 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/AbstractManagedThrottlerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/AbstractManagedThrottlerTest.java
@@ -24,8 +24,8 @@ import javax.management.ObjectName;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
@@ -36,7 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public abstract class AbstractManagedThrottlerTest extends ManagementTestSupport {
protected Long runTestManageThrottler() throws Exception {
@@ -76,8 +75,8 @@ public abstract class AbstractManagedThrottlerTest extends ManagementTestSupport
Long total = (Long) mbeanServer.getAttribute(routeName, "TotalProcessingTime");
- // 10 * delay (100) + tolerance (200)
- assertTrue(total < 1200, "Should take at most 1.2 sec: was " + total);
+ // 10 * delay (100) + tolerance (1500 for slow CI)
+ assertTrue(total < 2500, "Should take at most 2.5 sec: was " + total);
// change the throttler using JMX
mbeanServer.setAttribute(throttlerName, new Attribute("MaximumRequests", (long) 2));
@@ -120,7 +119,7 @@ public abstract class AbstractManagedThrottlerTest extends ManagementTestSupport
template.sendBody("seda:throttleCountAsync", "Message " + i);
}
- assertTrue(notifier.matches(2, TimeUnit.SECONDS));
+ assertTrue(notifier.matches(5, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
Long completed = (Long) mbeanServer.getAttribute(routeName, "ExchangesCompleted");
@@ -147,15 +146,15 @@ public abstract class AbstractManagedThrottlerTest extends ManagementTestSupport
template.sendBody("seda:throttleCountAsyncException", "Message " + i);
}
- assertTrue(notifier.matches(2, TimeUnit.SECONDS));
+ assertTrue(notifier.matches(5, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
- // give a sec for exception handling to finish..
- Thread.sleep(500);
-
- // since all exchanges ended w/ exception, they are not completed
- Long completed = (Long) mbeanServer.getAttribute(routeName, "ExchangesCompleted");
- assertEquals(0, completed.longValue());
+ // wait for exception handling to finish
+ Awaitility.await().atMost(5, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ Long c = (Long) mbeanServer.getAttribute(routeName, "ExchangesCompleted");
+ assertEquals(0, c.longValue());
+ });
}
@Test
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAConcurrentThrottlerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAConcurrentThrottlerTest.java
index 3fd3101c2b9d..1dcf3d430e1c 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAConcurrentThrottlerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAConcurrentThrottlerTest.java
@@ -26,22 +26,20 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ThrottlingMode;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ManagedAConcurrentThrottlerTest extends AbstractManagedThrottlerTest {
@Test
public void testManageThrottler() throws Exception {
final Long total = super.runTestManageThrottler();
- // 10 * delay (100) + tolerance (200)
- assertTrue(total < 1200, "Should take at most 1.2 sec: was " + total);
+ // 10 * delay (100) + tolerance (1500 for slow CI)
+ assertTrue(total < 2500, "Should take at most 2.5 sec: was " + total);
}
@DisabledOnOs(OS.WINDOWS)
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAThrottlerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAThrottlerTest.java
index ac94bfd87d24..c556ac727bbd 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAThrottlerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAThrottlerTest.java
@@ -25,14 +25,12 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on GitHub Actions")
public class ManagedAThrottlerTest extends AbstractManagedThrottlerTest {
@Test
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
index 02575fd1d4db..cdce64023024 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.management;
+import java.util.concurrent.TimeUnit;
+
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -27,10 +29,10 @@ import org.apache.camel.api.management.mbean.ManagedAggregateProcessorMBean;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.aggregate.AggregateController;
import org.apache.camel.processor.aggregate.DefaultAggregateController;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
@@ -38,7 +40,6 @@ import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TY
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Flaky on Github CI")
@DisabledOnOs(OS.AIX)
public class ManagedAggregateControllerTest extends ManagementTestSupport {
@@ -67,8 +68,11 @@ public class ManagedAggregateControllerTest extends ManagementTestSupport {
getMockEndpoint("mock:aggregated").expectedBodiesReceivedInAnyOrder("test1test3", "test2test4");
getMockEndpoint("mock:aggregated").expectedPropertyReceived(Exchange.AGGREGATED_COMPLETED_BY, "force");
- Integer pending = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
- assertEquals(2, pending.intValue());
+ Awaitility.await().atMost(5, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ Integer p = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
+ assertEquals(2, p.intValue());
+ });
Integer groups = (Integer) mbeanServer.invoke(on, "forceCompletionOfAllGroups", null, null);
assertEquals(2, groups.intValue());
@@ -102,7 +106,7 @@ public class ManagedAggregateControllerTest extends ManagementTestSupport {
Integer inflight = (Integer) mbeanServer.getAttribute(on, "InProgressCompleteExchanges");
assertEquals(0, inflight.intValue());
- pending = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
+ Integer pending = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
assertEquals(0, pending.intValue());
}
@@ -123,8 +127,11 @@ public class ManagedAggregateControllerTest extends ManagementTestSupport {
getMockEndpoint("mock:aggregated").expectedBodiesReceivedInAnyOrder("test1test3");
getMockEndpoint("mock:aggregated").expectedPropertyReceived(Exchange.AGGREGATED_COMPLETED_BY, "force");
- Integer pending = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
- assertEquals(2, pending.intValue());
+ Awaitility.await().atMost(5, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ Integer p = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
+ assertEquals(2, p.intValue());
+ });
Integer groups = (Integer) mbeanServer.invoke(on, "forceCompletionOfGroup", new Object[] { "1" },
new String[] { "java.lang.String" });
@@ -159,8 +166,8 @@ public class ManagedAggregateControllerTest extends ManagementTestSupport {
Integer inflight = (Integer) mbeanServer.getAttribute(on, "InProgressCompleteExchanges");
assertEquals(0, inflight.intValue());
- pending = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
- assertEquals(1, pending.intValue());
+ Integer pending2 = (Integer) mbeanServer.invoke(on, "aggregationRepositoryGroups", null, null);
+ assertEquals(1, pending2.intValue());
// we can also use the client mbean
ManagedAggregateProcessorMBean client = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class)
diff --git a/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
index 3f24d54bb836..50c1d1270b31 100644
--- a/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
+++ b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.infra.aws2.services;
import java.net.URI;
import java.net.URISyntaxException;
+import java.time.Duration;
import java.util.Arrays;
import java.util.stream.Collectors;
@@ -84,7 +85,10 @@ public class AWSContainer extends GenericContainer<AWSContainer> {
protected void setupContainer(boolean fixedPort) {
ContainerEnvironmentUtil.configurePort(this, fixedPort, SERVICE_PORT);
- waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
+ waitingFor(Wait.forHttp("/_localstack/health")
+ .forPort(SERVICE_PORT)
+ .forStatusCode(200)
+ .withStartupTimeout(Duration.ofSeconds(120)));
}
public AwsCredentialsProvider getCredentialsProvider() {