Disable tests that use Docker when Docker is unavailable

Closes gh-19616
This commit is contained in:
Andy Wilkinson
2020-01-10 20:35:18 +00:00
parent b5ef6d40c0
commit b5ae8b0af5
5 changed files with 60 additions and 0 deletions

View File

@@ -13,6 +13,7 @@ dependencies {
intTestImplementation enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent"))
intTestImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')
intTestImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support')
intTestImplementation 'org.apache.httpcomponents:httpasyncclient'
intTestImplementation 'org.awaitility:awaitility'
intTestImplementation 'org.testcontainers:testcontainers'

View File

@@ -26,12 +26,14 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
import org.awaitility.Awaitility;
import org.awaitility.core.ConditionTimeoutException;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -42,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* Deployment integration tests.
*/
@ExtendWith(DisabledIfDockerUnavailable.class)
class DeploymentIntegrationTests {
@ParameterizedTest