This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit a95615bdc77d2f8210285bf4438ef17afc0f824d Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Wed May 29 10:06:06 2024 +0200 (chores) camel-couchbase: cleanup disabling resource-intensive tests --- .../couchbase/integration/ConsumeMessagesWithLimitIT.java | 10 ++-------- .../couchbase/integration/ConsumeResumeStrategyIT.java | 10 ++-------- .../couchbase/integration/ProduceMessagesSimpleIT.java | 10 ++-------- .../couchbase/integration/ProduceMessagesWithAutoIDIT.java | 10 ++-------- .../component/couchbase/integration/RemoveMessagesIT.java | 10 ++-------- 5 files changed, 10 insertions(+), 40 deletions(-) diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java index 8fc06cabd98..2d28de1bf5f 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java @@ -25,16 +25,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfSystemProperties; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -@DisabledIfSystemProperties({ - @DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org", - disabledReason = "Apache CI nodes are too resource constrained for this test"), - @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on GitHub Actions"), - @DisabledIfSystemProperty(named = "couchbase.enable.it", matches = "false", - disabledReason = "Too resource intensive for most systems to run reliably"), -}) +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Too resource intensive for most systems to run reliably") @Tags({ @Tag("couchbase-71") }) public class ConsumeMessagesWithLimitIT extends CouchbaseIntegrationTestBase { diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java index 899b87458c5..7236ae97b54 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java @@ -32,19 +32,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfSystemProperties; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_RESUME_ACTION; import static org.awaitility.Awaitility.await; -@DisabledIfSystemProperties({ - @DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org", - disabledReason = "Apache CI nodes are too resource constrained for this test"), - @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on GitHub Actions"), - @DisabledIfSystemProperty(named = "couchbase.enable.it", matches = "false", - disabledReason = "Too resource intensive for most systems to run reliably"), -}) +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Too resource intensive for most systems to run reliably") @Tags({ @Tag("couchbase-71") }) public class ConsumeResumeStrategyIT extends CouchbaseIntegrationTestBase { static class TestCouchbaseResumeAdapter implements ResumeActionAware { diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java index 690c17a8d6e..1a44fe0382e 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java @@ -22,16 +22,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfSystemProperties; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -@DisabledIfSystemProperties({ - @DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org", - disabledReason = "Apache CI nodes are too resource constrained for this test"), - @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on GitHub Actions"), - @DisabledIfSystemProperty(named = "couchbase.enable.it", matches = "false", - disabledReason = "Too resource intensive for most systems to run reliably"), -}) +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Too resource intensive for most systems to run reliably") @Tags({ @Tag("couchbase-7") }) public class ProduceMessagesSimpleIT extends CouchbaseIntegrationTestBase { diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java index 516db0aabfd..6bfc317154c 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java @@ -21,16 +21,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfSystemProperties; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -@DisabledIfSystemProperties({ - @DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org", - disabledReason = "Apache CI nodes are too resource constrained for this test"), - @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on GitHub Actions"), - @DisabledIfSystemProperty(named = "couchbase.enable.it", matches = "false", - disabledReason = "Too resource intensive for most systems to run reliably"), -}) +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Too resource intensive for most systems to run reliably") @Tags({ @Tag("couchbase-7") }) public class ProduceMessagesWithAutoIDIT extends CouchbaseIntegrationTestBase { diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java index 420682cd05c..a84f5bba6a1 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java @@ -22,19 +22,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfSystemProperties; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_DELETE; import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_ID; -@DisabledIfSystemProperties({ - @DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org", - disabledReason = "Apache CI nodes are too resource constrained for this test"), - @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on GitHub Actions"), - @DisabledIfSystemProperty(named = "couchbase.enable.it", matches = "false", - disabledReason = "Too resource intensive for most systems to run reliably"), -}) +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Too resource intensive for most systems to run reliably") @Tags({ @Tag("couchbase-7") }) public class RemoveMessagesIT extends CouchbaseIntegrationTestBase {
