Skip to content

Commit 05b3d5b

Browse files
committed
fix test
1 parent ee5bf18 commit 05b3d5b

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ tempest: 0001_squashed_0002_make_message_type_nullable
3939

4040
uptime: 0048_delete_uptime_status_columns
4141

42-
workflow_engine: 0098_detectorgroup_detector_set_null
42+
workflow_engine: 0099_backfill_metric_issue_detectorgroup

src/sentry/workflow_engine/migrations/0099_backfill_metric_issue_detectorgroup.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from sentry import eventstore
1414
from sentry.new_migrations.migrations import CheckedMigration
1515
from sentry.snuba.dataset import Dataset
16-
from sentry.utils.query import RangeQuerySetWrapper
1716

1817
logger = logging.getLogger(__name__)
1918

@@ -77,9 +76,7 @@ def backfill_metric_issue_detectorgroup(
7776
DetectorGroup = apps.get_model("workflow_engine", "DetectorGroup")
7877
Detector = apps.get_model("workflow_engine", "Detector")
7978

80-
for group in RangeQuerySetWrapper(
81-
Group.objects.filter(type=8001, detectorgroup__isnull=True)
82-
): # metric issues
79+
for group in Group.objects.filter(type=8001, detectorgroup__isnull=True): # metric issues
8380
# figure out the detector
8481
latest_event = get_oldest_or_latest_event(group, EventOrdering.LATEST)
8582
if not latest_event:
@@ -139,7 +136,7 @@ class Migration(CheckedMigration):
139136
is_post_deployment = True
140137

141138
dependencies = [
142-
("sentry", "1003_group_history_prev_history_safe_removal"),
139+
# ("sentry", "1003_group_history_prev_history_safe_removal"),
143140
("workflow_engine", "0098_detectorgroup_detector_set_null"),
144141
]
145142

@@ -150,7 +147,7 @@ class Migration(CheckedMigration):
150147
hints={
151148
"tables": [
152149
"workflow_engine_detectorgroup",
153-
"sentry_group",
150+
"sentry_groupedmessage",
154151
]
155152
},
156153
),

tests/sentry/workflow_engine/migrations/test_0099_backfill_metric_issue_detectorgroup.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@
44
from sentry.testutils.cases import TestMigrations
55
from sentry.testutils.helpers.datetime import before_now
66
from sentry.workflow_engine.models import Detector, DetectorGroup
7-
from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
7+
from tests.sentry.issues.test_utils import OccurrenceTestMixin
88

99

10-
class BackfillMetricIssueDetectorGroupTest(TestMigrations, BaseWorkflowTest):
10+
class BackfillMetricIssueDetectorGroupTest(TestMigrations, OccurrenceTestMixin):
1111
migrate_from = "0098_detectorgroup_detector_set_null"
1212
migrate_to = "0099_backfill_metric_issue_detectorgroup"
1313
app = "workflow_engine"
1414

1515
def setup_initial_state(self) -> None:
16-
self.org = self.create_organization(name="test-org")
17-
self.project = self.create_project(organization=self.org)
18-
1916
self.detector = Detector.objects.create(
2017
project=self.project,
2118
name="Test Detector",
@@ -35,6 +32,12 @@ def setup_initial_state(self) -> None:
3532
assert group_info is not None
3633
self.metric_issue = group_info.group
3734

35+
deleted_detector = Detector.objects.create(
36+
project=self.project,
37+
name="Test Detector 2",
38+
type=MetricIssue.slug,
39+
config={"detection_type": AlertRuleDetectionType.STATIC.value},
40+
)
3841
event = self.store_event(
3942
data={
4043
"event_id": "b" * 32,
@@ -45,14 +48,15 @@ def setup_initial_state(self) -> None:
4548
occurrence_data = self.build_occurrence_data(
4649
event_id=event.event_id,
4750
project_id=self.project.id,
48-
fingerprint=[f"detector-{123}"],
49-
evidence_data={"detector_id": 123},
51+
fingerprint=[f"detector-{deleted_detector.id}"],
52+
evidence_data={"detector_id": deleted_detector.id},
5053
type=MetricIssue.type_id,
5154
)
5255

5356
_, group_info = save_issue_occurrence(occurrence_data, event)
5457
assert group_info is not None
5558
self.metric_issue_deleted_detector = group_info.group
59+
deleted_detector.delete()
5660

5761
self.metric_issue_no_occurrence = self.create_group(
5862
project=self.project, type=MetricIssue.type_id

0 commit comments

Comments
 (0)