You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2026/07/27 13:09:01 UTC

(camel-quarkus) branch main updated (e14fb486f0 -> 8db3b2fac0)

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


    from e14fb486f0 Next is 3.39.0-SNAPSHOT
     new 09cffe3b46 Make timeout for Quartz process configurable
     new 39c960bbf5 Get log path from property
     new 8db3b2fac0 Ensure connection to Splunk HEC works before executing tests

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel/quarkus/test/support/splunk/SplunkTestResource.java    | 9 ++++++---
 .../java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java    | 5 ++++-
 .../quartz-clustered/src/main/resources/application.properties   | 3 +++
 .../camel/quarkus/component/quartz/it/QuartzClusteredTest.java   | 5 ++++-
 .../camel/quarkus/component/splunk/hec/it/SplunkHecTest.java     | 3 +--
 5 files changed, 18 insertions(+), 7 deletions(-)


(camel-quarkus) 02/03: Get log path from property

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 39c960bbf525187fa3e0c292a15d5bf144487e6a
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Tue Jul 14 19:30:27 2026 +0200

    Get log path from property
---
 .../test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java b/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java
index ae63f16560..bd816825eb 100644
--- a/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java
+++ b/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java
@@ -29,6 +29,7 @@ import jakarta.ws.rs.core.MediaType;
 import org.apache.camel.dsl.xml.io.XmlRoutesBuilderLoader;
 import org.apache.camel.quarkus.core.DisabledModelJAXBContextFactory;
 import org.apache.camel.xml.LwModelToXMLDumper;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
@@ -125,8 +126,10 @@ public class CoreMainXmlIoTest {
 
     @Test
     public void testDumpRoutes() {
+        final String logPath = ConfigProvider.getConfig()
+                .getValue("quarkus.log.file.path", String.class);
         await().atMost(10L, TimeUnit.SECONDS).pollDelay(100, TimeUnit.MILLISECONDS).until(() -> {
-            String log = Files.readString(Paths.get("target/quarkus.log"));
+            String log = Files.readString(Paths.get(logPath));
             return logContainsDumpedRoutes(log);
         });
     }


(camel-quarkus) 03/03: Ensure connection to Splunk HEC works before executing tests

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 8db3b2fac07fec1219b18c98123dc3e73663c927
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Thu Jul 16 14:21:23 2026 +0200

    Ensure connection to Splunk HEC works before executing tests
---
 .../camel/quarkus/test/support/splunk/SplunkTestResource.java    | 9 ++++++---
 .../camel/quarkus/component/splunk/hec/it/SplunkHecTest.java     | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java b/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java
index a6a6a355e5..3f60cc14f2 100644
--- a/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java
+++ b/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java
@@ -81,9 +81,12 @@ public class SplunkTestResource implements QuarkusTestResourceLifecycleManager {
                     .withEnv("SPLUNK_LICENSE_URI", "Free")
                     .withEnv("SPLUNK_GENERAL_TERMS", "--accept-sgt-current-at-splunk-com")
                     .withEnv("TZ", TimeZone.getDefault().getID())
-                    .waitingFor(
-                            Wait.forLogMessage(".*Ansible playbook complete.*\\n", 1)
-                                    .withStartupTimeout(Duration.ofMinutes(10)));
+                    .waitingFor(Wait.forHttp("/services/collector/health")
+                            .forPort(HEC_PORT)
+                            .forStatusCode(200)
+                            .usingTls()
+                            .allowInsecure()
+                            .withStartupTimeout(Duration.ofMinutes(10)));
 
             if (certPath != null && caCertPath != null && keystorePassword != null) {
                 //combine key + certificates into 1 pem - required for splunk
diff --git a/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java b/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java
index 475ed070a5..d72c386bc1 100644
--- a/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java
+++ b/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java
@@ -82,8 +82,7 @@ public class SplunkHecTest {
                 .post("/splunk-hec/send/wrongSslContextParameters")
                 .then()
                 .statusCode(500)
-                .body(Matchers.either(org.hamcrest.core.StringContains.containsString("ssl exception"))
-                        .or(org.hamcrest.core.StringContains.containsString("Connection refused")));
+                .body(Matchers.containsString("ssl exception"));
     }
 
     @Test


(camel-quarkus) 01/03: Make timeout for Quartz process configurable

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 09cffe3b467a1a60cf588534c3d1662e7e7eb7f3
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Mon Jul 13 15:59:43 2026 +0200

    Make timeout for Quartz process configurable
---
 .../quartz-clustered/src/main/resources/application.properties       | 3 +++
 .../camel/quarkus/component/quartz/it/QuartzClusteredTest.java       | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/integration-tests/quartz-clustered/src/main/resources/application.properties b/integration-tests/quartz-clustered/src/main/resources/application.properties
index 88a07e8cfe..7f9e6412c7 100644
--- a/integration-tests/quartz-clustered/src/main/resources/application.properties
+++ b/integration-tests/quartz-clustered/src/main/resources/application.properties
@@ -40,3 +40,6 @@ quarkus.flyway.baseline-description = Quartz
 quarkus.flyway.clean-at-start=true
 
 quartz.node.name = NodeA
+
+# Test properties
+quartz.clustered.test.startup.timeout.seconds=60
diff --git a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
index 6bcd4fe73b..741542fcc8 100644
--- a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
+++ b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
@@ -101,7 +101,10 @@ class QuartzClusteredTest {
     }
 
     private void awaitStartup(QuarkusProcessExecutor quarkusProcessExecutor) {
-        Awaitility.await().atMost(60, TimeUnit.SECONDS).pollDelay(1, TimeUnit.SECONDS).until(() -> {
+        long timeout = ConfigProvider.getConfig()
+                .getValue("quartz.clustered.test.startup.timeout.seconds", Long.class);
+
+        Awaitility.await().atMost(timeout, TimeUnit.SECONDS).pollDelay(1, TimeUnit.SECONDS).until(() -> {
             return isApplicationHealthy(quarkusProcessExecutor.getHttpPort());
         });
     }