Fix flaky tests #3294
Merged
Fix flaky tests #3294
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
put_global_hpke_keypair() cannot return MutationTargetAlreadyExists. Rather than change that method, this PR fixes two tests to just avoid calling the method when it's not needed, and removes matching on the MutationTargetAlreadyExists error variant.
inahga
approved these changes
Jul 10, 2024
| // The test context code randomly generates an ID so there's a chance for | ||
| // collision. | ||
| Ok(_) | Err(datastore::Error::MutationTargetAlreadyExists) => Ok(()), | ||
| Err(err) => Err(err), |
There was a problem hiding this comment.
🤦 ah I see, there is no ON CONFLICT DO NOTHING in put_global_hpke_keypair() so if there's a conflict it'll fail with a harder-to-match postgres uniqueness constraint violation error.
branlwyd
approved these changes
Jul 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes some flaky tests I found. Common themes:
put_global_hpke_keypair()does not returnMutationTargetAlreadyExists, so we can't try to insert a keypair and suppress errors, but we can compare config IDs up front in tests.