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

Merge branch '3.4.x'

This commit is contained in:
Moritz Halbritter 2025-03-10 16:15:48 +01:00
parent 1aa1bab0a8 8fca1dbb6f
commit 58fab66163
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
View File

@ -36,6 +36,7 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.IOUtils;
import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.TaskOutcome; import org.gradle.testkit.runner.TaskOutcome;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.condition.OS;
@ -514,6 +515,7 @@ class BootBuildImageIntegrationTests {
} }
@TestTemplate @TestTemplate
@Disabled("Docker is behaving differently on various systems")
void failsWithIncompatiblePlatform() throws IOException { void failsWithIncompatiblePlatform() throws IOException {
writeMainClass(); writeMainClass();
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage"); BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage");