From e9b0980c293697dc448f6bd282dd570cb905580d Mon Sep 17 00:00:00 2001
From: Andrew Liu <159852527+aliu39@users.noreply.github.com>
Date: Tue, 15 Jul 2025 10:46:43 -0700
Subject: [PATCH] fix(feedback): use @patch to avoid flakes with test_openai.py

---
 tests/sentry/feedback/test_create_feedback.py | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/tests/sentry/feedback/test_create_feedback.py b/tests/sentry/feedback/test_create_feedback.py
index 88d06cc6bded4a..1972edfa5969bb 100644
--- a/tests/sentry/feedback/test_create_feedback.py
+++ b/tests/sentry/feedback/test_create_feedback.py
@@ -451,7 +451,6 @@ def test_create_feedback_spam_detection_produce_to_kafka(
     mock_produce_occurrence_to_kafka,
     input_message,
     expected_result,
-    monkeypatch,
     feature_flag,
 ):
     with Feature({"organizations:user-feedback-spam-ingest": feature_flag}):
@@ -491,11 +490,10 @@ def test_create_feedback_spam_detection_produce_to_kafka(
         mock_openai = Mock()
         mock_openai().chat.completions.create = create_dummy_openai_response
 
-        monkeypatch.setattr("sentry.llm.providers.openai.OpenAI", mock_openai)
-
-        create_feedback_issue(
-            event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
-        )
+        with patch("sentry.llm.providers.openai.OpenAI", mock_openai):
+            create_feedback_issue(
+                event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
+            )
 
         # Check if the 'is_spam' evidence in the Kafka message matches the expected result
         is_spam_evidence = [
@@ -526,7 +524,6 @@ def test_create_feedback_spam_detection_produce_to_kafka(
 def test_create_feedback_spam_detection_project_option_false(
     default_project,
     mock_produce_occurrence_to_kafka,
-    monkeypatch,
 ):
     default_project.update_option("sentry:feedback_ai_spam_detection", False)
 
@@ -567,11 +564,10 @@ def test_create_feedback_spam_detection_project_option_false(
         mock_openai = Mock()
         mock_openai().chat.completions.create = create_dummy_openai_response
 
-        monkeypatch.setattr("sentry.llm.providers.openai.OpenAI", mock_openai)
-
-        create_feedback_issue(
-            event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
-        )
+        with patch("sentry.llm.providers.openai.OpenAI", mock_openai):
+            create_feedback_issue(
+                event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
+            )
 
         # Check if the 'is_spam' evidence in the Kafka message matches the expected result
         is_spam_evidence = [
@@ -588,7 +584,6 @@ def test_create_feedback_spam_detection_project_option_false(
 @django_db_all
 def test_create_feedback_spam_detection_set_status_ignored(
     default_project,
-    monkeypatch,
 ):
     with Feature(
         {
@@ -632,11 +627,10 @@ def test_create_feedback_spam_detection_set_status_ignored(
         mock_openai = Mock()
         mock_openai().chat.completions.create = create_dummy_openai_response
 
-        monkeypatch.setattr("sentry.llm.providers.openai.OpenAI", mock_openai)
-
-        create_feedback_issue(
-            event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
-        )
+        with patch("sentry.llm.providers.openai.OpenAI", mock_openai):
+            create_feedback_issue(
+                event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
+            )
 
         group = Group.objects.get()
         assert group.status == GroupStatus.IGNORED