From ed0b7131ba543750c7f176877bb747142b2ca1d1 Mon Sep 17 00:00:00 2001 From: Colleen O'Rourke Date: Tue, 12 May 2026 15:40:19 -0700 Subject: [PATCH] chore(alerts): Remove triggred_for_incident from tests --- src/sentry/testutils/fixtures.py | 1 - tests/sentry/incidents/test_charts.py | 12 +++--------- tests/sentry/integrations/slack/test_unfurl.py | 12 +++--------- tests/sentry/integrations/test_metric_alerts.py | 8 ++------ 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/sentry/testutils/fixtures.py b/src/sentry/testutils/fixtures.py index 04c761549b6c..b3bbcaa709b1 100644 --- a/src/sentry/testutils/fixtures.py +++ b/src/sentry/testutils/fixtures.py @@ -485,7 +485,6 @@ def create_alert_rule_trigger_action( self, alert_rule_trigger=None, target_identifier=None, - triggered_for_incident=None, *args, **kwargs, ): diff --git a/tests/sentry/incidents/test_charts.py b/tests/sentry/incidents/test_charts.py index 43ebfcdda6ee..7d8262c40896 100644 --- a/tests/sentry/incidents/test_charts.py +++ b/tests/sentry/incidents/test_charts.py @@ -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() @@ -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() @@ -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() diff --git a/tests/sentry/integrations/slack/test_unfurl.py b/tests/sentry/integrations/slack/test_unfurl.py index bcc27b33234a..31fcbe96acc6 100644 --- a/tests/sentry/integrations/slack/test_unfurl.py +++ b/tests/sentry/integrations/slack/test_unfurl.py @@ -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( @@ -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}" @@ -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}" diff --git a/tests/sentry/integrations/test_metric_alerts.py b/tests/sentry/integrations/test_metric_alerts.py index a1a5d9df6a5e..78e8f42f4490 100644 --- a/tests/sentry/integrations/test_metric_alerts.py +++ b/tests/sentry/integrations/test_metric_alerts.py @@ -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()) @@ -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())