Skip to content

Commit 282f8ae

Browse files
committed
fix(test): add missing order= to widget_1 and widget_2 in dashboard test setUp
The order=0 and order=1 at lines 70/80 were on DashboardWidgetQuery (queries within widgets), not on DashboardWidget itself. Widget_1 and widget_2 had order=NULL, causing nondeterministic ordering under ORDER BY (order, id).
1 parent 68ba62f commit 282f8ae

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

.github/workflows/backend-xdist.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -319,17 +319,6 @@ jobs:
319319
done
320320
done
321321
322-
- name: Debug DB config
323-
run: |
324-
python3 -c "
325-
import os, django
326-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'sentry.conf.server')
327-
from django.conf import settings
328-
for alias, db in settings.DATABASES.items():
329-
test_name = db.get('TEST', {}).get('NAME', '(not set)')
330-
print(f'{alias}: NAME={db[\"NAME\"]}, TEST.NAME={test_name}')
331-
"
332-
333322
- name: Download selected tests artifact
334323
if: needs.prepare-selective-tests.outputs.has-selected-tests == 'true'
335324
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0

tests/sentry/dashboards/endpoints/test_organization_dashboard_details.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def setUp(self) -> None:
4444
super().setUp()
4545
self.widget_1 = DashboardWidget.objects.create(
4646
dashboard=self.dashboard,
47+
order=0,
4748
title="Widget 1",
4849
display_type=DashboardWidgetDisplayTypes.LINE_CHART,
4950
widget_type=DashboardWidgetTypes.DISCOVER,
@@ -52,6 +53,7 @@ def setUp(self) -> None:
5253
)
5354
self.widget_2 = DashboardWidget.objects.create(
5455
dashboard=self.dashboard,
56+
order=1,
5557
title="Widget 2",
5658
display_type=DashboardWidgetDisplayTypes.TABLE,
5759
widget_type=DashboardWidgetTypes.DISCOVER,
@@ -1848,8 +1850,6 @@ def test_remove_widget_and_add_new(self) -> None:
18481850

18491851
widgets = self.get_widgets(self.dashboard.id)
18501852
assert len(widgets) == 4
1851-
for w in widgets:
1852-
print(f"DEBUG widget id={w.id} title={w.title!r} order={w.order}")
18531853
assert self.widget_1.id == widgets[0].id
18541854
assert self.widget_2.id == widgets[1].id
18551855
assert self.widget_4.id == widgets[2].id

0 commit comments

Comments
 (0)