Skip to content

Minor fixes to some integration tests - #1364

Merged
Kehrlann merged 7 commits into
cloudfoundry:5.x.xfrom
Lokowandtg:5.x.x_v2InfoEndpoint
Oct 1, 2026
Merged

Kehrlann merged 7 commits into
cloudfoundry:5.x.xfrom
Lokowandtg:5.x.x_v2InfoEndpoint

Conversation

@Lokowandtg

@Lokowandtg Lokowandtg commented Jun 10, 2026 •

Copy link
Copy Markdown
Contributor

InfoTest fails if running against a CF where v2 API is disabled.
OrganizationsTest.getDefaultDomain fails when running in kind-deployment landscape.

The package "serviceInstances" (with capital "I") does not match the package declaration in the contained class. This creates problems in Eclipse on Windows.

Fixes #1363

InfoTest fails if running against a CF where v2 API is disabled.
OrganizationsTest fails when running in kind-deployment landscape.

The package "serviceInstances" (with capital "I") does not match the package
declaration in the contained class. This creates problems in Eclipse on Windows.
The old docker image was outdated and did not work
on recent docker versions. Switching to the image of
a better supported test application.

@Kehrlann Kehrlann left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @Lokowandtg

Thanks for your contribution. Surprised that some tests (all the .client.v2 and .operations tests) pass without V2, are you using SKIP_V2_TESTS ? And if so, shouldn't InfoTest be skipped?

Comment on lines +187 to +199
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.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Can we infer the domain from the TEST_APIHOST env var?

(Not a hard requirement but it'd be nicer than hardcoding deployment options)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point. Will do.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't work on my setup:

[ERROR]   Run 1: OrganizationsTest.lambda$getDefaultDomain$7:189
Expecting actual:
  "apps.tas.b225eb9d.shepherd.tanzu.broadcom.net"
to contain:
  ["apps.", ".sys.tas.b225eb9d.shepherd.tanzu.broadcom.net"]
but could not find:
  [".sys.tas.b225eb9d.shepherd.tanzu.broadcom.net"]

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. As there is no way to derive the default domain from the ApiHost, I just check that the endpoint returns something.

@Kehrlann Kehrlann changed the title Minor fixes to some integration tests. fixes #1363 Minor fixes to some integration tests Oct 1, 2026
@Kehrlann
Kehrlann merged commit 372b8d2 into cloudfoundry:5.x.x Oct 1, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants