fix(hc): Adds ID reservations to tombstone tests #89352
Merged
+35
−0
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
markstory
reviewed
Apr 11, 2025
Comment on lines
612
to
614
| with assume_test_silo_mode_of(model): | ||
| with transaction.atomic(using=router.db_for_write(model)): | ||
| with connections[router.db_for_write(model)].cursor() as cursor: |
There was a problem hiding this comment.
You could combine all of these with , to save some indentation.
Comment on lines
+683
to
685
| reserve_model_ids(Monitor, 121) | ||
| reserve_model_ids(User, 78) | ||
| desired_user_and_monitor_ids = [(10, 9), (42, 40), (77, 120)] |
There was a problem hiding this comment.
I thought part of the problem was that the explict pk values already existed in the database and using the same ids over caused integrity errors. Does this advance the sequences to the point where other tests use higher values?
There was a problem hiding this comment.
I didn't encounter that case when testing. Using @asottile-sentry's script, I was getting PK collisions on newly created monitors without explicit PKs specified, and the PK ID sequence incremented causing it to overlap. I can guard against this case as well by just clearing monitors and users in a setup block.
markstory
approved these changes
Apr 14, 2025
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.
Tombstone testing currently relies on hardcoded model IDs to ensure correctness when batching and watermarking. This unfortunately leaves the tests susceptible to failing if a hardcoded model ID collides with a model using the primary key sequence.
This addresses this issue by reserving a minimum number of IDs using a new utility function, ensuring we always have the minimum requisite IDs needed to perform our test.