mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Disable tests that use Docker when Docker is unavailable
Closes gh-19616
This commit is contained in:
parent
b5ef6d40c0
commit
b5ae8b0af5
@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.testsupport.testcontainers;
|
||||
|
||||
import org.junit.jupiter.api.extension.ConditionEvaluationResult;
|
||||
import org.junit.jupiter.api.extension.ExecutionCondition;
|
||||
import org.junit.jupiter.api.extension.ExtensionContext;
|
||||
import org.testcontainers.DockerClientFactory;
|
||||
|
||||
/**
|
||||
* An {@link ExecutionCondition} that disables execution if Docker is unavailable.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
public class DisabledIfDockerUnavailable implements ExecutionCondition {
|
||||
|
||||
@Override
|
||||
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
|
||||
System.out.println("Checking Docker's availability");
|
||||
if (isDockerAvailable()) {
|
||||
System.out.println("Docker available");
|
||||
return ConditionEvaluationResult.enabled("Docker is available");
|
||||
}
|
||||
System.out.println("Docker unavailable");
|
||||
return ConditionEvaluationResult.disabled("Docker is not available");
|
||||
}
|
||||
|
||||
private boolean isDockerAvailable() {
|
||||
try {
|
||||
DockerClientFactory.instance().client();
|
||||
return true;
|
||||
}
|
||||
catch (Throwable ex) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -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'
|
||||
|
@ -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
|
||||
|
@ -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'
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user