mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Adapt Paketo system tests to changes in the Tomcat buildpack
Closes gh-35148
This commit is contained in:
parent
90952a2dd9
commit
963542e7fc
@ -21,7 +21,6 @@ import java.io.FileWriter;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
@ -276,10 +275,16 @@ class PaketoBuilderTests {
|
|||||||
"paketo-buildpacks/spring-boot");
|
"paketo-buildpacks/spring-boot");
|
||||||
metadata.processOfType("web")
|
metadata.processOfType("web")
|
||||||
.extracting("command", "args")
|
.extracting("command", "args")
|
||||||
.containsExactly("bash", Arrays.asList("catalina.sh", "run"));
|
.satisfiesExactly((command) -> assertThat(command).asString().endsWith("sh"),
|
||||||
|
(args) -> assertThat(args).asList()
|
||||||
|
.satisfiesExactly((arg) -> assertThat(arg).asString().endsWith("catalina.sh"),
|
||||||
|
(arg) -> assertThat(arg).asString().isEqualTo("run")));
|
||||||
metadata.processOfType("tomcat")
|
metadata.processOfType("tomcat")
|
||||||
.extracting("command", "args")
|
.extracting("command", "args")
|
||||||
.containsExactly("bash", Arrays.asList("catalina.sh", "run"));
|
.satisfiesExactly((command) -> assertThat(command).asString().endsWith("sh"),
|
||||||
|
(args) -> assertThat(args).asList()
|
||||||
|
.satisfiesExactly((arg) -> assertThat(arg).asString().endsWith("catalina.sh"),
|
||||||
|
(arg) -> assertThat(arg).asString().isEqualTo("run")));
|
||||||
});
|
});
|
||||||
assertImageHasSbomLayer(imageReference, config, "apache-tomcat");
|
assertImageHasSbomLayer(imageReference, config, "apache-tomcat");
|
||||||
DigestCapturingCondition digest = new DigestCapturingCondition();
|
DigestCapturingCondition digest = new DigestCapturingCondition();
|
||||||
|
Loading…
Reference in New Issue
Block a user