Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
b5ae8b0a
Commit
b5ae8b0a
authored
Jan 10, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable tests that use Docker when Docker is unavailable
Closes gh-19616
parent
b5ef6d40
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
0 deletions
+60
-0
DisabledIfDockerUnavailable.java
...stsupport/testcontainers/DisabledIfDockerUnavailable.java
+52
-0
build.gradle
spring-boot-tests/spring-boot-deployment-tests/build.gradle
+1
-0
DeploymentIntegrationTests.java
...s/src/intTest/java/sample/DeploymentIntegrationTests.java
+3
-0
build.gradle
...ration-tests/spring-boot-launch-script-tests/build.gradle
+1
-0
SysVinitLaunchScriptIntegrationTests.java
...ot/launchscript/SysVinitLaunchScriptIntegrationTests.java
+3
-0
No files found.
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DisabledIfDockerUnavailable.java
0 → 100644
View file @
b5ae8b0a
/*
* 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
;
}
}
}
spring-boot-tests/spring-boot-deployment-tests/build.gradle
View file @
b5ae8b0a
...
@@ -13,6 +13,7 @@ dependencies {
...
@@ -13,6 +13,7 @@ dependencies {
intTestImplementation
enforcedPlatform
(
project
(
path:
":spring-boot-project:spring-boot-parent"
))
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-starters:spring-boot-starter-test'
)
intTestImplementation
project
(
':spring-boot-project:spring-boot-tools:spring-boot-test-support'
)
intTestImplementation
'org.apache.httpcomponents:httpasyncclient'
intTestImplementation
'org.apache.httpcomponents:httpasyncclient'
intTestImplementation
'org.awaitility:awaitility'
intTestImplementation
'org.awaitility:awaitility'
intTestImplementation
'org.testcontainers:testcontainers'
intTestImplementation
'org.testcontainers:testcontainers'
...
...
spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/DeploymentIntegrationTests.java
View file @
b5ae8b0a
...
@@ -26,12 +26,14 @@ import org.apache.http.impl.client.HttpClients;
...
@@ -26,12 +26,14 @@ import org.apache.http.impl.client.HttpClients;
import
org.apache.http.impl.client.StandardHttpRequestRetryHandler
;
import
org.apache.http.impl.client.StandardHttpRequestRetryHandler
;
import
org.awaitility.Awaitility
;
import
org.awaitility.Awaitility
;
import
org.awaitility.core.ConditionTimeoutException
;
import
org.awaitility.core.ConditionTimeoutException
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.junit.jupiter.params.ParameterizedTest
;
import
org.junit.jupiter.params.ParameterizedTest
;
import
org.junit.jupiter.params.provider.MethodSource
;
import
org.junit.jupiter.params.provider.MethodSource
;
import
org.testcontainers.containers.GenericContainer
;
import
org.testcontainers.containers.GenericContainer
;
import
org.testcontainers.images.builder.ImageFromDockerfile
;
import
org.testcontainers.images.builder.ImageFromDockerfile
;
import
org.springframework.boot.test.web.client.TestRestTemplate
;
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.boot.web.client.RestTemplateBuilder
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
...
@@ -42,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -42,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
/**
* Deployment integration tests.
* Deployment integration tests.
*/
*/
@ExtendWith
(
DisabledIfDockerUnavailable
.
class
)
class
DeploymentIntegrationTests
{
class
DeploymentIntegrationTests
{
@ParameterizedTest
@ParameterizedTest
...
...
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
View file @
b5ae8b0a
...
@@ -15,6 +15,7 @@ dependencies {
...
@@ -15,6 +15,7 @@ dependencies {
app
project
(
path:
':spring-boot-project:spring-boot-starters:spring-boot-starter-web'
,
configuration:
'mavenRepository'
)
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
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
project
(
':spring-boot-project:spring-boot-starters:spring-boot-starter-test'
)
intTestImplementation
'org.testcontainers:testcontainers'
intTestImplementation
'org.testcontainers:testcontainers'
}
}
...
...
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java
View file @
b5ae8b0a
...
@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
...
@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
import
org.assertj.core.api.Condition
;
import
org.assertj.core.api.Condition
;
import
org.junit.jupiter.api.Assumptions
;
import
org.junit.jupiter.api.Assumptions
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.junit.jupiter.params.ParameterizedTest
;
import
org.junit.jupiter.params.ParameterizedTest
;
import
org.junit.jupiter.params.provider.MethodSource
;
import
org.junit.jupiter.params.provider.MethodSource
;
import
org.testcontainers.containers.GenericContainer
;
import
org.testcontainers.containers.GenericContainer
;
...
@@ -32,6 +33,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
...
@@ -32,6 +33,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
import
org.testcontainers.utility.MountableFile
;
import
org.testcontainers.utility.MountableFile
;
import
org.springframework.boot.ansi.AnsiColor
;
import
org.springframework.boot.ansi.AnsiColor
;
import
org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
...
@@ -42,6 +44,7 @@ import static org.hamcrest.Matchers.containsString;
...
@@ -42,6 +44,7 @@ import static org.hamcrest.Matchers.containsString;
* @author Andy Wilkinson
* @author Andy Wilkinson
* @author Ali Shahbour
* @author Ali Shahbour
*/
*/
@ExtendWith
(
DisabledIfDockerUnavailable
.
class
)
class
SysVinitLaunchScriptIntegrationTests
{
class
SysVinitLaunchScriptIntegrationTests
{
private
static
final
char
ESC
=
27
;
private
static
final
char
ESC
=
27
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment