Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xds/googledirectpath: fix google-c2p resolver test case involving bootstrap env config #6657

Merged
merged 2 commits into from
Sep 22, 2023

Conversation

apolcyn
Copy link
Contributor

@apolcyn apolcyn commented Sep 22, 2023

Fixes #6572

It looks like this test was originally written assuming that federation was default off.

When federation was defaulted on, the expectations changed. Update to fix expectations and make the test behave the ~same whether it's ran on GCE or not.

cc @easwars

RELEASE NOTES: none

@dfawley dfawley added this to the 1.59 Release milestone Sep 22, 2023
@dfawley dfawley requested a review from easwars September 22, 2023 18:43
defer func() { onGCE = oldOnGCE }()

// don't actually read the bootstrap file contents
tXDSClient := &testXDSClient{closed: make(chan struct{}, 1)}
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: tXDSClient is a bit hard on the eyes. Can we simply name this xdsClient?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@easwars easwars assigned apolcyn and unassigned easwars Sep 22, 2023
@apolcyn
Copy link
Contributor Author

apolcyn commented Sep 22, 2023

@easwars please merge if this looks good (I don't have access)

@easwars easwars changed the title [testing] Fix google-c2p resolver test case involving bootstrap env config xds/googledirectpath: fix google-c2p resolver test case involving bootstrap env config Sep 22, 2023
@easwars easwars merged commit a758b62 into grpc:master Sep 22, 2023
10 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

xds/googledirectpath: tests fail in cloudtop
3 participants