(camel) branch main updated: [camel-jbang-it] Improve InfrastructureITCase (#19916)

[davsclaus]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new fccfa89698a8 [camel-jbang-it] Improve InfrastructureITCase (#19916)
fccfa89698a8 is described below

commit fccfa89698a8033b9f665b4dbea6c2a558755bcf
Author: Jakub Vrubel <52706818+jvru...@users.noreply.github.com>
AuthorDate: Fri Nov 14 08:09:54 2025 +0100

    [camel-jbang-it] Improve InfrastructureITCase (#19916)
---
 .../camel/dsl/jbang/it/InfrastructureITCase.java   | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
 
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
index ddd7be71085d..fe25b73ab338 100644
--- 
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
+++ 
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/InfrastructureITCase.java
@@ -37,25 +37,36 @@ public class InfrastructureITCase extends JBangTestSupport {
     @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
                               disabledReason = "Requires too much resources")
     @Test
-    public void runServiceTest() {
-        execInContainer(String.format("nohup camel infra run %s&", SERVICE));
+    public void runStopServiceTest() {
+        String msg = execute("infra run --background " + SERVICE);
+        String PID = getPID(msg);
+        Assertions.assertThat(msg).contains(String.format("Running %s in 
background", SERVICE));
         Awaitility.await()
                 .atMost(Duration.ofSeconds(30))
                 .pollInterval(Duration.ofSeconds(1))
-                .untilAsserted(() -> Assertions.assertThat(execute("infra 
ps")).containsPattern(SERVICE));
-        Assertions.assertThat(execute("infra stop " + SERVICE))
-                .contains("Shutting down external services");
+                .untilAsserted(() -> Assertions.assertThat(execute("infra ps"))
+                        .contains(PID));
+        checkCommandOutputs("infra stop " + SERVICE, "Shutting down external 
services (PID: " + PID);
+        checkCommandDoesNotOutput("infra ps", PID);
     }
 
     @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
                               disabledReason = "Requires too much resources")
     @Test
     public void runServiceWithImplementationTest() {
-        execInContainer(String.format("nohup camel infra run %s %s&", 
IMPL_SERVICE, IMPLEMENTATION));
+        String msg = execute(String.format("infra run --background %s %s", 
IMPL_SERVICE, IMPLEMENTATION));
+        String PID = getPID(msg);
+        Assertions.assertThat(msg).contains(String.format("Running %s in 
background", IMPL_SERVICE));
         Awaitility.await()
                 .atMost(Duration.ofSeconds(30))
                 .pollInterval(Duration.ofSeconds(1))
                 .untilAsserted(() -> Assertions.assertThat(execute("infra ps"))
-                        .containsPattern(IMPL_SERVICE + "\\s+" + 
IMPLEMENTATION));
+                        .containsPattern(PID + "\\s+" + IMPL_SERVICE + "\\s+" 
+ IMPLEMENTATION));
+        checkCommandOutputs("infra stop " + IMPL_SERVICE, "Shutting down 
external services (PID: " + PID);
+        checkCommandDoesNotOutput("infra ps", PID);
+    }
+
+    private String getPID(String message) {
+        return message.split(":")[1].replaceAll("[^0-9]", "");
     }
 }