Post merge cleanup

Author: kcons

src/sentry/rules/processing/buffer_processing.py

@@ -194,7 +194,7 @@ def process_buffer() -> None:
 
             project_ids = list(all_project_ids_and_timestamps.keys())
             for project_id in project_ids:
-                process_in_batches(project_id, processing_type)
+                process_in_batches(buffer, project_id, processing_type)
 
             buffer.delete_keys(
                 buffer_keys,

tests/sentry/buffer/test_redis.py

@@ -322,27 +322,6 @@ def test_bulk_sorted_set_single_key(self) -> None:
         assert len(project_ids_and_timestamps) == 4
         assert set(project_ids_and_timestamps.keys()) == set(project_ids)
 
-    def test_buffer_hook_registry(self) -> None:
-        """Test that we can add an event to the registry and that the callback is invoked"""
-        mock = Mock()
-        redis_buffer_registry._registry[BufferHookEvent.FLUSH] = mock
-
-        redis_buffer_registry.callback(BufferHookEvent.FLUSH)
-        assert mock.call_count == 1
-
-    @mock.patch("sentry.rules.processing.buffer_processing.metrics.timer")
-    def test_callback(self, mock_metrics_timer: MagicMock) -> None:
-        redis_buffer_registry.add_handler(BufferHookEvent.FLUSH, process_buffer)
-        self.buf.process_batch()
-        assert mock_metrics_timer.call_count == 1
-
-    def test_process_batch(self) -> None:
-        """Test that the registry's callbacks are invoked when we process a batch"""
-        mock = Mock()
-        redis_buffer_registry._registry[BufferHookEvent.FLUSH] = mock
-        self.buf.process_batch()
-        assert mock.call_count == 1
-
     def test_delete_batch(self) -> None:
         """Test that after we add things to redis we can clean it up"""
         project_id = 1