Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,15 @@ public void info() {
.consumeNextWith(
response -> {
Version expected = Version.valueOf(SUPPORTED_API_VERSION);
Version actual = Version.valueOf(response.getApiVersion());

Version actual;
String version = response.getApiVersion();
if (version == null || version.isEmpty()) {
assertThat("CF API v2 is disabled")
.isEqualTo(response.getSupport());
actual = Version.of(0, 0, 0);
} else {
actual = Version.valueOf(version);
}
assertThat(actual).isLessThanOrEqualTo(expected);
})
.expectComplete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,21 @@ public void getDefaultDomain() {
.map(GetOrganizationDefaultDomainResponse::getName)
.as(StepVerifier::create)
.consumeNextWith(
name -> assertThat(name).contains("apps.", ".shepherd.tanzu.broadcom.net"))
name -> {
assertThat(name)
.satisfiesAnyOf(
nameParam ->
assertThat(nameParam)
.contains(
"apps.",
".shepherd.tanzu.broadcom.net"),
nameParam ->
assertThat(nameParam)
.contains(
"apps.",
".127-0-0-1.nip.io")); // when
// testing with kind-deploy.
})
.expectComplete()
.verify(Duration.ofMinutes(5));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,7 @@ private static Mono<Void> createDockerApplication(
.push(
PushApplicationRequest.builder()
.diskQuota(512)
.dockerImage("cloudfoundry/lattice-app")
.dockerImage("cloudfoundry/grace")
.healthCheckType(ApplicationHealthCheck.PORT)
.memory(64)
.name(name)
Expand Down