Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/sentry/testutils/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,6 @@ def create_alert_rule_trigger_action(
self,
alert_rule_trigger=None,
target_identifier=None,
triggered_for_incident=None,
*args,
**kwargs,
):
Expand Down
12 changes: 3 additions & 9 deletions tests/sentry/incidents/test_charts.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ def test_eap_alert(self, mock_client_get: MagicMock, mock_generate_chart: MagicM
date_started=timezone.now() - datetime.timedelta(minutes=2),
)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)

alert_rule_serialized_response: AlertRuleSerializerResponse = serialize(
alert_rule, None, AlertRuleSerializer()
Expand Down Expand Up @@ -157,9 +155,7 @@ def test_eap_log_alert(
date_started=timezone.now() - datetime.timedelta(minutes=2),
)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)

alert_rule_serialized_response: AlertRuleSerializerResponse = serialize(
alert_rule, None, AlertRuleSerializer()
Expand Down Expand Up @@ -204,9 +200,7 @@ def test_eap_trace_metric_alert(
date_started=timezone.now() - datetime.timedelta(minutes=2),
)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)

alert_rule_serialized_response: AlertRuleSerializerResponse = serialize(
alert_rule, None, AlertRuleSerializer()
Expand Down
12 changes: 3 additions & 9 deletions tests/sentry/integrations/slack/test_unfurl.py
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,7 @@ def test_unfurl_metric_alert(self) -> None:
)
incident.update(identifier=123)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)

links = [
UnfurlableUrl(
Expand Down Expand Up @@ -477,9 +475,7 @@ def test_unfurl_metric_alerts_chart(self, mock_generate_chart: MagicMock) -> Non
)
incident.update(identifier=123)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)
self._wire_workflow_engine_for_incident(alert_rule, incident)

url = f"https://sentry.io/organizations/{self.organization.slug}/issues/alerts/rules/details/{alert_rule.id}/?alert={incident.identifier}"
Expand Down Expand Up @@ -587,9 +583,7 @@ def test_unfurl_metric_alerts_chart_eap_spans(self, mock_generate_chart: MagicMo
date_started=timezone.now() - timedelta(minutes=2),
)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)
self._wire_workflow_engine_for_incident(alert_rule, incident)

url = f"https://sentry.io/organizations/{self.organization.slug}/issues/alerts/rules/details/{alert_rule.id}/?alert={incident.identifier}"
Expand Down
8 changes: 2 additions & 6 deletions tests/sentry/integrations/test_metric_alerts.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ def test_returns_correct_info_with_workflow_engine_dual_write(self) -> None:
date_started=date_started,
)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)
metric_value = 123
referrer = "metric_alert_custom"
notification_uuid = str(uuid.uuid4())
Expand Down Expand Up @@ -115,9 +113,7 @@ def test_returns_correct_info_placeholder_incident(self) -> None:
date_started=date_started,
)
trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
self.create_alert_rule_trigger_action(
alert_rule_trigger=trigger, triggered_for_incident=incident
)
self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)
metric_value = 123
referrer = "metric_alert_custom"
notification_uuid = str(uuid.uuid4())
Expand Down
Loading