Skip to content

Commit 6da23df

Browse files
author
Cathy Teng
committed
fix tests
1 parent 332f0eb commit 6da23df

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

tests/sentry/workflow_engine/processors/test_detector.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ class TestGetDetectorsForEvent(TestCase):
838838
def setUp(self) -> None:
839839
super().setUp()
840840
self.project = self.create_project()
841-
self.group = self.create_group(project=self.project)
841+
self.group = self.create_group(project=self.project, type=MetricIssue.type_id)
842842
self.detector = self.create_detector(project=self.project, type=MetricIssue.slug)
843843
self.error_detector = self.create_detector(project=self.project, type=ErrorGroupType.slug)
844844
self.issue_stream_detector = self.create_detector(
@@ -950,7 +950,7 @@ def test_exclude_issue_stream_detector(self) -> None:
950950
class TestGetDetectorByEvent(TestCase):
951951
def setUp(self) -> None:
952952
super().setUp()
953-
self.group = self.create_group(project=self.project)
953+
self.group = self.create_group(project=self.project, type=MetricIssue.type_id)
954954
self.detector = self.create_detector(project=self.project, type=MetricIssue.slug)
955955
self.error_detector = self.create_detector(project=self.project, type=ErrorGroupType.slug)
956956
self.event = self.store_event(project_id=self.project.id, data={})
@@ -981,6 +981,7 @@ def test_with_occurrence(self) -> None:
981981
assert result == self.detector
982982

983983
def test_without_occurrence(self) -> None:
984+
self.group.type = ErrorGroupType.type_id
984985
group_event = GroupEvent.from_event(self.event, self.group)
985986
group_event.occurrence = None
986987

@@ -1028,7 +1029,7 @@ def test_no_detector_id(self) -> None:
10281029
with pytest.raises(Detector.DoesNotExist):
10291030
get_detector_by_event(event_data)
10301031

1031-
def test_defaults_to_error_detector(self) -> None:
1032+
def test_errors_on_no_detector(self) -> None:
10321033
occurrence = IssueOccurrence(
10331034
id=uuid.uuid4().hex,
10341035
project_id=self.project.id,
@@ -1051,9 +1052,8 @@ def test_defaults_to_error_detector(self) -> None:
10511052

10521053
event_data = WorkflowEventData(event=group_event, group=self.group)
10531054

1054-
result = get_detector_by_event(event_data)
1055-
1056-
assert result == self.error_detector
1055+
with pytest.raises(Detector.DoesNotExist):
1056+
get_detector_by_event(event_data)
10571057

10581058

10591059
class TestAssociateNewGroupWithDetector(TestCase):

tests/sentry/workflow_engine/processors/test_workflow.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from sentry.eventstream.base import GroupState
88
from sentry.grouping.grouptype import ErrorGroupType
9+
from sentry.incidents.grouptype import MetricIssue
910
from sentry.models.activity import Activity
1011
from sentry.models.environment import Environment
1112
from sentry.services.eventstore.models import GroupEvent
@@ -63,7 +64,9 @@ def setUp(self) -> None:
6364
)
6465
)
6566

66-
self.group, self.event, self.group_event = self.create_group_event()
67+
self.group, self.event, self.group_event = self.create_group_event(
68+
group_type_id=MetricIssue.type_id
69+
)
6770
self.event_data = WorkflowEventData(
6871
event=self.group_event,
6972
group=self.group,
@@ -304,6 +307,7 @@ def test_same_environment_only(self) -> None:
304307
def test_issue_occurrence_event(self) -> None:
305308
issue_occurrence = self.build_occurrence(evidence_data={"detector_id": self.detector.id})
306309
self.group_event.occurrence = issue_occurrence
310+
self.group_event.group.type = issue_occurrence.type.type_id
307311

308312
result = process_workflows(self.batch_client, self.event_data, FROZEN_TIME)
309313
assert result.data.triggered_workflows == {self.workflow}
@@ -670,6 +674,7 @@ class TestWorkflowEnqueuing(BaseWorkflowTest):
670674
buffer_timestamp = (FROZEN_TIME + timedelta(seconds=1)).timestamp()
671675

672676
def setUp(self) -> None:
677+
self.project = self.create_project(create_default_detectors=True)
673678
(
674679
self.workflow,
675680
self.detector,
@@ -679,7 +684,7 @@ def setUp(self) -> None:
679684

680685
occurrence = self.build_occurrence(evidence_data={"detector_id": self.detector.id})
681686
self.group, self.event, self.group_event = self.create_group_event(
682-
occurrence=occurrence,
687+
occurrence=occurrence, group_type_id=MetricIssue.type_id
683688
)
684689
self.event_data = WorkflowEventData(event=self.group_event, group=self.group)
685690
self.action_group, _ = self.create_workflow_action(self.workflow)
@@ -877,17 +882,23 @@ def setUp(self) -> None:
877882
) = self.create_detector_and_workflow()
878883

879884
self.action_group, self.action = self.create_workflow_action(workflow=self.workflow)
885+
self.issue_stream_detector = self.create_detector(
886+
project=self.project,
887+
type=IssueStreamGroupType.slug,
888+
)
880889

881890
self.group, self.event, self.group_event = self.create_group_event(
882-
occurrence=self.build_occurrence(evidence_data={"detector_id": self.detector.id})
891+
occurrence=self.build_occurrence(evidence_data={"detector_id": self.detector.id}),
892+
group_type_id=MetricIssue.type_id,
883893
)
884894
self.event_data = WorkflowEventData(event=self.group_event, group=self.group)
885895
self.batch_client = DelayedWorkflowClient()
886896

887897
@patch("sentry.utils.metrics.incr")
888898
@patch("sentry.workflow_engine.tasks.utils.IssueOccurrence.fetch")
899+
@patch("sentry.workflow_engine.processors.action.Action.trigger")
889900
def test_metrics_issue_dual_processing_metrics(
890-
self, mock_fetch: MagicMock, mock_incr: MagicMock
901+
self, mock_trigger: MagicMock, mock_fetch: MagicMock, mock_incr: MagicMock
891902
) -> None:
892903
mock_fetch.return_value = self.group_event.occurrence
893904

@@ -901,6 +912,7 @@ def test_metrics_issue_dual_processing_metrics(
901912
},
902913
sample_rate=1.0,
903914
)
915+
mock_trigger.assert_called_once()
904916

905917
def test_basic__no_filter(self) -> None:
906918
triggered_action_filters, _ = evaluate_workflows_action_filters(

0 commit comments

Comments
 (0)