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 583c91931d67522048b58a516939d30c5b6896fa Author: Lukas Lowinger <[email protected]> AuthorDate: Tue Jul 7 09:32:08 2026 +0200 Check for local Docker socket or remote Docker via DOCKER_HOST --- .../quarkus/component/aws2/lambda/it/Aws2LambdaTest.java | 12 +++--------- .../quarkus/test/support/aws2/DockerSocketAvailable.java | 4 +++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java index 87514b4fea..8ef21e93e4 100644 --- a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java +++ b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java @@ -19,8 +19,6 @@ package org.apache.camel.quarkus.component.aws2.lambda.it; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.zip.ZipEntry; @@ -31,11 +29,11 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.response.ExtractableResponse; +import org.apache.camel.quarkus.test.EnabledIf; import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport; +import org.apache.camel.quarkus.test.support.aws2.DockerSocketAvailable; import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.awaitility.Awaitility.await; @@ -47,6 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @QuarkusTest @QuarkusTestResource(Aws2TestResource.class) +@EnabledIf(DockerSocketAvailable.class) class Aws2LambdaTest extends BaseAWs2TestSupport { private static final Logger LOG = Logger.getLogger(Aws2LambdaTest.class); @@ -54,11 +53,6 @@ class Aws2LambdaTest extends BaseAWs2TestSupport { super("/aws2-lambda"); } - @BeforeEach - public void beforeEach() { - Assumptions.assumeTrue(Files.exists(Paths.get("/var/run/docker.sock"))); - } - @Test public void performingOperationsOnLambdaFunctionShouldSucceed() { final String functionName = "cqFunction" + java.util.UUID.randomUUID().toString().replace("-", ""); diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java index 00e82fa496..ee81c6ac89 100644 --- a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java +++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java @@ -23,6 +23,8 @@ import java.util.function.BooleanSupplier; public class DockerSocketAvailable implements BooleanSupplier { @Override public boolean getAsBoolean() { - return Files.exists(Path.of("/var/run/docker.sock")); + // Check for local Docker socket or remote Docker via DOCKER_HOST + return Files.exists(Path.of("/var/run/docker.sock")) + || System.getenv("DOCKER_HOST") != null; } }
