Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable tests that use Docker when Docker is unavailable

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-tests/spring-boot-deployment-tests/build.gradle
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'

3
spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/DeploymentIntegrationTests.java
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

1
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
View File

@@ -15,6 +15,7 @@ dependencies {
app project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter-web', configuration: 'mavenRepository')
intTestImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent'))
intTestImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support')
intTestImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')
intTestImplementation 'org.testcontainers:testcontainers'
}

3
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java
View File

@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.Assumptions;
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;
@@ -32,6 +33,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.MountableFile;
import org.springframework.boot.ansi.AnsiColor;
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -42,6 +44,7 @@ import static org.hamcrest.Matchers.containsString;
* @author Andy Wilkinson
* @author Ali Shahbour
*/
@ExtendWith(DisabledIfDockerUnavailable.class)
class SysVinitLaunchScriptIntegrationTests {
private static final char ESC = 27;