root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

This commit is contained in:
Andy Wilkinson 2020-08-04 18:24:28 +01:00
parent 6e00022b2d 1233288df0
commit 07b6f83c7a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,8 @@ package org.springframework.boot.launchscript;
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.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
@ -27,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Alexey Vinogradov * @author Alexey Vinogradov
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@DisabledIfDockerUnavailable
class JarLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests { class JarLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests {
JarLaunchScriptIntegrationTests() { JarLaunchScriptIntegrationTests() {