Skip to content

Fix flaky GitHub tests by adding explicit QuerySet ordering #2641

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.

Sign up for GitHub

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

Draft
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix flaky GitHub tests by adding explicit QuerySet ordering #2641

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6b9091
Initial plan
Copilot Jul 24, 2025
cd0f52d
Fix flaky GitHub tests by adding explicit QuerySet ordering
Copilot Jul 24, 2025
3e35c1a
Fix formatting issues with ruff-format
Copilot Jul 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions content_sync/apis/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,18 @@ def upsert_content_file(
def upsert_content_files(self, query_set: WebsiteContentQuerySet | None = None):
"""Commit all website content, with 1 commit per user, optionally filtering with a QuerySet""" # noqa: E501
if query_set:
content_files = query_set.values_list("updated_by", flat=True).distinct()
content_files = (
query_set.values_list("updated_by", flat=True)
.distinct()
.order_by("updated_by")
)
else:
content_files = (
WebsiteContent.objects.all_with_deleted()
.filter(website=self.website)
.values_list("updated_by", flat=True)
.distinct()
.order_by("updated_by")
)
for user_id in content_files:
self.upsert_content_files_for_user(user_id, query_set)
Expand All @@ -353,11 +358,15 @@ def upsert_content_files_for_user(
"""
Upsert multiple WebsiteContent objects to github in one commit, optionally filtering with a QuerySet
""" # noqa: E501
unsynced_states = ContentSyncState.objects.filter(
Q(content__website=self.website) & Q(content__updated_by=user_id)
).exclude(
Q(current_checksum=F("synced_checksum"), content__deleted__isnull=True)
& Q(synced_checksum__isnull=False)
unsynced_states = (
ContentSyncState.objects.filter(
Q(content__website=self.website) & Q(content__updated_by=user_id)
)
.exclude(
Q(current_checksum=F("synced_checksum"), content__deleted__isnull=True)
& Q(synced_checksum__isnull=False)
)
.order_by("content__id")
)
if query_set:
unsynced_states = unsynced_states.filter(content__in=query_set)
Expand Down
Loading