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

Revert temporary fixes to endpoints v2 tests #2971

Merged
merged 1 commit into from
Sep 19, 2023

Conversation

zalimeni
Copy link
Member

@zalimeni zalimeni commented Sep 19, 2023

These were necessary to get tests to pass during the merge of several PRs across consul and consul-k8s but are no longer needed.

Changes proposed in this PR:

How I've tested this PR: Local + CI

How I expect reviewers to test this PR: 👓

Checklist:

These were necessary to get tests to pass during the merge of several
PRs across `consul` and `consul-k8s` but are no longer needed.
@zalimeni zalimeni added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport signals that a PR will not contain a backport label labels Sep 19, 2023
@zalimeni zalimeni marked this pull request as ready for review September 19, 2023 13:41
@zalimeni
Copy link
Member Author

zalimeni commented Sep 19, 2023

@DanStough I'm guessing this was another merge-order / merge-conflict situation that's since resolved - my change to filter for TCP L4 ports would have made the commented test cases go from failing to passing. Repeat local runs look ok to me and flake seems less likely for the commented code, so I'm inclined to un-comment and assume this is stable.

Copy link
Contributor

@DanStough DanStough left a comment

Choose a reason for hiding this comment

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

My bad! Thank you for the PR 🎉

@zalimeni
Copy link
Member Author

@DanStough no sweat at all! I've had several "huh?" moments w/ tests this week myself, and I'd rather someone disable a test than let it stay broken, so thanks for the heads up!

@zalimeni zalimeni merged commit f662cf5 into main Sep 19, 2023
34 of 38 checks passed
@zalimeni zalimeni deleted the zalimeni/fixup-endpoints-v2-tests branch September 19, 2023 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-backport signals that a PR will not contain a backport label pr/no-changelog PR does not need a corresponding .changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants