Skip to content

Commit c78cc44

Browse files
committed
Disable more s-b-testcontainers tests when Docker is unavailable
See gh-35245
1 parent d224f69 commit c78cc44

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.boot.testcontainers.lifecycle.TestcontainersLifecycleOrderIntegrationTests.ContainerConfig;
2929
import org.springframework.boot.testcontainers.lifecycle.TestcontainersLifecycleOrderIntegrationTests.TestConfig;
3030
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
31+
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
3132
import org.springframework.boot.testsupport.testcontainers.RedisContainer;
3233
import org.springframework.context.annotation.Bean;
3334
import org.springframework.context.annotation.Configuration;
@@ -46,6 +47,7 @@
4647
@ExtendWith(AssertingSpringExtension.class)
4748
@ContextConfiguration(classes = { TestConfig.class, ContainerConfig.class })
4849
@DirtiesContext
50+
@DisabledIfDockerUnavailable
4951
public class TestcontainersLifecycleOrderIntegrationTests {
5052

5153
static List<String> events = Collections.synchronizedList(new ArrayList<>());

spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2424
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2525
import org.springframework.boot.testcontainers.lifecycle.TestcontainersLifecycleApplicationContextInitializer;
26+
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
2627
import org.springframework.boot.testsupport.testcontainers.RedisContainer;
2728
import org.springframework.context.annotation.Bean;
2829
import org.springframework.context.annotation.Configuration;
@@ -36,6 +37,7 @@
3637
*
3738
* @author Phillip Webb
3839
*/
40+
@DisabledIfDockerUnavailable
3941
class TestcontainersPropertySourceAutoConfigurationTests {
4042

4143
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

0 commit comments

Comments
 (0)