fix merge

Author: kcons

tests/sentry/workflow_engine/processors/test_workflow.py

@@ -4,7 +4,6 @@
 import pytest
 from django.utils import timezone
 
-from sentry.eventstore.models import GroupEvent
 from sentry.eventstream.base import GroupState
 from sentry.grouping.grouptype import ErrorGroupType
 from sentry.models.activity import Activity
@@ -442,15 +441,10 @@ def test_enqueues_workflow_all_logic_type(self) -> None:
 
         process_workflows(self.event_data)
 
-<<<<<<< HEAD
-        project_ids = buffer.backend.bulk_get_sorted_set(
+        project_ids = workflow_buffer.get_backend().bulk_get_sorted_set(
             self.buffer_keys,
             min=0,
             max=self.buffer_timestamp,
-=======
-        project_ids = workflow_buffer.get_backend().get_sorted_set(
-            WORKFLOW_ENGINE_BUFFER_LIST_KEY, 0, self.buffer_timestamp
->>>>>>> 72e32fd402c (fixup)
         )
         assert list(project_ids.keys()) == [self.project.id]
 
@@ -479,15 +473,10 @@ def test_enqueues_workflow_any_logic_type(self) -> None:
 
         process_workflows(self.event_data)
 
-<<<<<<< HEAD
-        project_ids = buffer.backend.bulk_get_sorted_set(
+        project_ids = workflow_buffer.get_backend().bulk_get_sorted_set(
             self.buffer_keys,
             min=0,
             max=self.buffer_timestamp,
-=======
-        project_ids = workflow_buffer.get_backend().get_sorted_set(
-            WORKFLOW_ENGINE_BUFFER_LIST_KEY, 0, self.buffer_timestamp
->>>>>>> 72e32fd402c (fixup)
         )
         assert list(project_ids.keys()) == [self.project.id]
 
@@ -566,15 +555,10 @@ def test_enqueues_with_when_and_if_slow_conditions(self) -> None:
 
         process_workflows(self.event_data)
 
-<<<<<<< HEAD
-        project_ids = buffer.backend.bulk_get_sorted_set(
+        project_ids = workflow_buffer.get_backend().bulk_get_sorted_set(
             self.buffer_keys,
             min=0,
             max=self.buffer_timestamp,
-=======
-        project_ids = workflow_buffer.get_backend().get_sorted_set(
-            WORKFLOW_ENGINE_BUFFER_LIST_KEY, 0, self.buffer_timestamp
->>>>>>> 72e32fd402c (fixup)
         )
         assert list(project_ids.keys()) == [self.project.id]
 
@@ -600,15 +584,10 @@ def test_enqueues_event_if_meets_fast_conditions(self) -> None:
 
         process_workflows(self.event_data)
 
-<<<<<<< HEAD
-        project_ids = buffer.backend.bulk_get_sorted_set(
+        project_ids = workflow_buffer.get_backend().bulk_get_sorted_set(
             self.buffer_keys,
             min=0,
             max=self.buffer_timestamp,
-=======
-        project_ids = workflow_buffer.get_backend().get_sorted_set(
-            WORKFLOW_ENGINE_BUFFER_LIST_KEY, 0, self.buffer_timestamp
->>>>>>> 72e32fd402c (fixup)
         )
         assert not project_ids
 
@@ -617,15 +596,10 @@ def test_enqueues_event_if_meets_fast_conditions(self) -> None:
 
         process_workflows(self.event_data)
 
-<<<<<<< HEAD
-        project_ids = buffer.backend.bulk_get_sorted_set(
+        project_ids = workflow_buffer.get_backend().bulk_get_sorted_set(
             self.buffer_keys,
             min=0,
             max=self.buffer_timestamp,
-=======
-        project_ids = workflow_buffer.get_backend().get_sorted_set(
-            WORKFLOW_ENGINE_BUFFER_LIST_KEY, 0, self.buffer_timestamp
->>>>>>> 72e32fd402c (fixup)
         )
         assert list(project_ids.keys()) == [self.project.id]
 
@@ -775,15 +749,10 @@ def test_enqueues_when_slow_conditions(self):
 
         enqueue_workflows(queue_items)
 
-<<<<<<< HEAD
-        project_ids = buffer.backend.bulk_get_sorted_set(
+        project_ids = workflow_buffer.get_backend().bulk_get_sorted_set(
             self.buffer_keys,
             min=0,
             max=timezone.now().timestamp(),
-=======
-        project_ids = workflow_buffer.get_backend().get_sorted_set(
-            WORKFLOW_ENGINE_BUFFER_LIST_KEY, 0, timezone.now().timestamp()
->>>>>>> 72e32fd402c (fixup)
         )
         assert list(project_ids.keys()) == [self.project.id]
 
@@ -819,14 +788,11 @@ def setUp(self) -> None:
 
     @patch("sentry.buffer.backend.push_to_sorted_set")
     @patch("sentry.buffer.backend.push_to_hash_bulk")
-<<<<<<< HEAD
     @patch("random.choice")
-=======
     @override_options({"workflow_engine.buffer.use_new_buffer": False})
->>>>>>> 72e32fd402c (fixup)
     def test_enqueue_workflows__adds_to_workflow_engine_buffer(
         self, mock_randchoice, mock_push_to_hash_bulk, mock_push_to_sorted_set
-    ):
+    ) -> None:
         mock_randchoice.return_value = f"{DelayedWorkflow.buffer_key}:{5}"
         enqueue_workflows(
             {
@@ -848,10 +814,13 @@ def test_enqueue_workflows__adds_to_workflow_engine_buffer(
 
     @patch("sentry.workflow_engine.buffer._backend.push_to_sorted_set")
     @patch("sentry.workflow_engine.buffer._backend.push_to_hash_bulk")
+    @patch("random.choice")
     @override_options({"workflow_engine.buffer.use_new_buffer": True})
     def test_enqueue_workflows__adds_to_workflow_engine_buffer_new_buffer(
-        self, mock_push_to_hash_bulk, mock_push_to_sorted_set
-    ):
+        self, mock_randchoice, mock_push_to_hash_bulk, mock_push_to_sorted_set
+    ) -> None:
+        key_choice = f"{DelayedWorkflow.buffer_key}:{5}"
+        mock_randchoice.return_value = key_choice
         enqueue_workflows(
             {
                 self.workflow: DelayedWorkflowItem(
@@ -866,7 +835,7 @@ def test_enqueue_workflows__adds_to_workflow_engine_buffer_new_buffer(
         )
 
         mock_push_to_sorted_set.assert_called_once_with(
-            key=WORKFLOW_ENGINE_BUFFER_LIST_KEY,
+            key=key_choice,
             value=[self.group_event.project_id],
         )
 
@@ -875,7 +844,7 @@ def test_enqueue_workflows__adds_to_workflow_engine_buffer_new_buffer(
     @override_options({"workflow_engine.buffer.use_new_buffer": False})
     def test_enqueue_workflow__adds_to_workflow_engine_set(
         self, mock_push_to_hash_bulk, mock_push_to_sorted_set
-    ):
+    ) -> None:
         current_time = timezone.now()
         workflow_filter_group_2 = self.create_data_condition_group()
         self.create_workflow_data_condition_group(