From c2f21e9fcd282b1e76b0614a4c5034717fd4e3d7 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 20 Jun 2024 08:46:20 +0200 Subject: [PATCH] Don't execute @DockerComposeTests if docker is not running Closes gh-41171 --- .../compose/service/connection/test/DockerComposeTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java index 1b32ead7945..23a013691d3 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java @@ -27,7 +27,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails; +import org.springframework.boot.testsupport.container.DisabledIfDockerUnavailable; import org.springframework.boot.testsupport.container.TestImage; +import org.springframework.boot.testsupport.process.DisabledIfProcessUnavailable; /** * A {@link Test test} that exercises Spring Boot's Docker Compose support. @@ -48,6 +50,8 @@ import org.springframework.boot.testsupport.container.TestImage; @Retention(RetentionPolicy.RUNTIME) @Documented @ExtendWith(DockerComposeTestExtension.class) +@DisabledIfDockerUnavailable +@DisabledIfProcessUnavailable({ "docker", "compose" }) public @interface DockerComposeTest { /**