Updated mock to make tests green again

Author: antonpirker

tests/integrations/asgi/test_asgi.py

@@ -128,7 +128,6 @@ async def app(scope, receive, send):
 
 @pytest.fixture
 def asgi3_custom_transaction_app():
-
     async def app(scope, receive, send):
         sentry_sdk.get_current_scope().set_transaction_name("foobar", source="custom")
         await send(

tests/integrations/celery/test_celery.py

@@ -597,7 +597,8 @@ def test_messaging_destination_name_default_exchange(
     mock_request.delivery_info = {"routing_key": routing_key, "exchange": ""}
 
     @celery_app.task()
-    def task(): ...
+    def task():
+        ...
 
     task.apply_async()
 
@@ -621,7 +622,8 @@ def test_messaging_destination_name_nondefault_exchange(
     mock_request.delivery_info = {"routing_key": "celery", "exchange": "custom"}
 
     @celery_app.task()
-    def task(): ...
+    def task():
+        ...
 
     task.apply_async()
 
@@ -635,7 +637,8 @@ def test_messaging_id(init_celery, capture_events):
     events = capture_events()
 
     @celery.task
-    def example_task(): ...
+    def example_task():
+        ...
 
     example_task.apply_async()
 
@@ -649,7 +652,8 @@ def test_retry_count_zero(init_celery, capture_events):
     events = capture_events()
 
     @celery.task()
-    def task(): ...
+    def task():
+        ...
 
     task.apply_async()
 
@@ -666,7 +670,8 @@ def test_retry_count_nonzero(mock_request, init_celery, capture_events):
     events = capture_events()
 
     @celery.task()
-    def task(): ...
+    def task():
+        ...
 
     task.apply_async()
 
@@ -684,7 +689,8 @@ def test_messaging_system(system, init_celery, capture_events):
     celery.conf.broker_url = f"{system}://example.com"  # noqa: E231
 
     @celery.task()
-    def task(): ...
+    def task():
+        ...
 
     task.apply_async()
 
@@ -707,7 +713,8 @@ def publish(*args, **kwargs):
     events = capture_events()
 
     @celery.task()
-    def task(): ...
+    def task():
+        ...
 
     with start_transaction():
         task.apply_async()
@@ -729,7 +736,8 @@ def test_receive_latency(init_celery, capture_events):
     events = capture_events()
 
     @celery.task()
-    def task(): ...
+    def task():
+        ...
 
     task.apply_async()
 
@@ -746,7 +754,8 @@ def tests_span_origin_consumer(init_celery, capture_events):
     events = capture_events()
 
     @celery.task()
-    def task(): ...
+    def task():
+        ...
 
     task.apply_async()
 
@@ -770,7 +779,8 @@ def publish(*args, **kwargs):
     events = capture_events()
 
     @celery.task()
-    def task(): ...
+    def task():
+        ...
 
     with start_transaction(name="custom_transaction"):
         task.apply_async()

tests/integrations/django/asgi/test_asgi.py

@@ -566,7 +566,8 @@ async def test_asgi_request_body(
 async def test_asgi_mixin_iscoroutinefunction_before_3_12():
     sentry_asgi_mixin = _asgi_middleware_mixin_factory(lambda: None)
 
-    async def get_response(): ...
+    async def get_response():
+        ...
 
     instance = sentry_asgi_mixin(get_response)
     assert asyncio.iscoroutinefunction(instance)
@@ -581,7 +582,8 @@ async def get_response(): ...
 def test_asgi_mixin_iscoroutinefunction_when_not_async_before_3_12():
     sentry_asgi_mixin = _asgi_middleware_mixin_factory(lambda: None)
 
-    def get_response(): ...
+    def get_response():
+        ...
 
     instance = sentry_asgi_mixin(get_response)
     assert not asyncio.iscoroutinefunction(instance)
@@ -597,7 +599,8 @@ def get_response(): ...
 async def test_asgi_mixin_iscoroutinefunction_after_3_12():
     sentry_asgi_mixin = _asgi_middleware_mixin_factory(lambda: None)
 
-    async def get_response(): ...
+    async def get_response():
+        ...
 
     instance = sentry_asgi_mixin(get_response)
     assert inspect.iscoroutinefunction(instance)
@@ -612,7 +615,8 @@ async def get_response(): ...
 def test_asgi_mixin_iscoroutinefunction_when_not_async_after_3_12():
     sentry_asgi_mixin = _asgi_middleware_mixin_factory(lambda: None)
 
-    def get_response(): ...
+    def get_response():
+        ...
 
     instance = sentry_asgi_mixin(get_response)
     assert not inspect.iscoroutinefunction(instance)

tests/integrations/spark/test_spark.py

@@ -87,88 +87,83 @@ def sentry_listener():
     return listener
 
 
-@pytest.fixture
-def mock_add_breadcrumb():
-    with patch("sentry_sdk.add_breadcrumb") as mock:
-        yield mock
-
-
-def test_sentry_listener_on_job_start(sentry_listener, mock_add_breadcrumb):
+def test_sentry_listener_on_job_start(sentry_listener):
     listener = sentry_listener
+    with patch.object(listener, "_add_breadcrumb") as mock_add_breadcrumb:
 
-    class MockJobStart:
-        def jobId(self):  # noqa: N802
-            return "sample-job-id-start"
+        class MockJobStart:
+            def jobId(self):  # noqa: N802
+                return "sample-job-id-start"
 
-    mock_job_start = MockJobStart()
-    listener.onJobStart(mock_job_start)
+        mock_job_start = MockJobStart()
+        listener.onJobStart(mock_job_start)
 
-    mock_add_breadcrumb.assert_called_once()
-    mock_hub = mock_add_breadcrumb.call_args
+        mock_add_breadcrumb.assert_called_once()
+        mock_hub = mock_add_breadcrumb.call_args
 
-    assert mock_hub.kwargs["level"] == "info"
-    assert "sample-job-id-start" in mock_hub.kwargs["message"]
+        assert mock_hub.kwargs["level"] == "info"
+        assert "sample-job-id-start" in mock_hub.kwargs["message"]
 
 
 @pytest.mark.parametrize(
     "job_result, level", [("JobSucceeded", "info"), ("JobFailed", "warning")]
 )
-def test_sentry_listener_on_job_end(
-    sentry_listener, mock_add_breadcrumb, job_result, level
-):
+def test_sentry_listener_on_job_end(sentry_listener, job_result, level):
     listener = sentry_listener
+    with patch.object(listener, "_add_breadcrumb") as mock_add_breadcrumb:
 
-    class MockJobResult:
-        def toString(self):  # noqa: N802
-            return job_result
+        class MockJobResult:
+            def toString(self):  # noqa: N802
+                return job_result
 
-    class MockJobEnd:
-        def jobId(self):  # noqa: N802
-            return "sample-job-id-end"
+        class MockJobEnd:
+            def jobId(self):  # noqa: N802
+                return "sample-job-id-end"
 
-        def jobResult(self):  # noqa: N802
-            result = MockJobResult()
-            return result
+            def jobResult(self):  # noqa: N802
+                result = MockJobResult()
+                return result
 
-    mock_job_end = MockJobEnd()
-    listener.onJobEnd(mock_job_end)
+        mock_job_end = MockJobEnd()
+        listener.onJobEnd(mock_job_end)
 
-    mock_add_breadcrumb.assert_called_once()
-    mock_hub = mock_add_breadcrumb.call_args
+        mock_add_breadcrumb.assert_called_once()
+        mock_hub = mock_add_breadcrumb.call_args
 
-    assert mock_hub.kwargs["level"] == level
-    assert mock_hub.kwargs["data"]["result"] == job_result
-    assert "sample-job-id-end" in mock_hub.kwargs["message"]
+        assert mock_hub.kwargs["level"] == level
+        assert mock_hub.kwargs["data"]["result"] == job_result
+        assert "sample-job-id-end" in mock_hub.kwargs["message"]
 
 
-def test_sentry_listener_on_stage_submitted(sentry_listener, mock_add_breadcrumb):
+def test_sentry_listener_on_stage_submitted(sentry_listener):
     listener = sentry_listener
+    with patch.object(listener, "_add_breadcrumb") as mock_add_breadcrumb:
 
-    class StageInfo:
-        def stageId(self):  # noqa: N802
-            return "sample-stage-id-submit"
+        class StageInfo:
+            def stageId(self):  # noqa: N802
+                return "sample-stage-id-submit"
 
-        def name(self):
-            return "run-job"
+            def name(self):
+                return "run-job"
 
-        def attemptId(self):  # noqa: N802
-            return 14
+            def attemptId(self):  # noqa: N802
+                return 14
 
-    class MockStageSubmitted:
-        def stageInfo(self):  # noqa: N802
-            stageinf = StageInfo()
-            return stageinf
+        class MockStageSubmitted:
+            def stageInfo(self):  # noqa: N802
+                stageinf = StageInfo()
+                return stageinf
 
-    mock_stage_submitted = MockStageSubmitted()
-    listener.onStageSubmitted(mock_stage_submitted)
+        mock_stage_submitted = MockStageSubmitted()
+        listener.onStageSubmitted(mock_stage_submitted)
 
-    mock_add_breadcrumb.assert_called_once()
-    mock_hub = mock_add_breadcrumb.call_args
+        mock_add_breadcrumb.assert_called_once()
+        mock_hub = mock_add_breadcrumb.call_args
 
-    assert mock_hub.kwargs["level"] == "info"
-    assert "sample-stage-id-submit" in mock_hub.kwargs["message"]
-    assert mock_hub.kwargs["data"]["attemptId"] == 14
-    assert mock_hub.kwargs["data"]["name"] == "run-job"
+        assert mock_hub.kwargs["level"] == "info"
+        assert "sample-stage-id-submit" in mock_hub.kwargs["message"]
+        assert mock_hub.kwargs["data"]["attemptId"] == 14
+        assert mock_hub.kwargs["data"]["name"] == "run-job"
 
 
 @pytest.fixture
@@ -208,39 +203,39 @@ def stageInfo(self):  # noqa: N802
 
 
 def test_sentry_listener_on_stage_completed_success(
-    sentry_listener, mock_add_breadcrumb, get_mock_stage_completed
+    sentry_listener, get_mock_stage_completed
 ):
     listener = sentry_listener
+    with patch.object(listener, "_add_breadcrumb") as mock_add_breadcrumb:
+        mock_stage_completed = get_mock_stage_completed(failure_reason=False)
+        listener.onStageCompleted(mock_stage_completed)
 
-    mock_stage_completed = get_mock_stage_completed(failure_reason=False)
-    listener.onStageCompleted(mock_stage_completed)
+        mock_add_breadcrumb.assert_called_once()
+        mock_hub = mock_add_breadcrumb.call_args
 
-    mock_add_breadcrumb.assert_called_once()
-    mock_hub = mock_add_breadcrumb.call_args
-
-    assert mock_hub.kwargs["level"] == "info"
-    assert "sample-stage-id-submit" in mock_hub.kwargs["message"]
-    assert mock_hub.kwargs["data"]["attemptId"] == 14
-    assert mock_hub.kwargs["data"]["name"] == "run-job"
-    assert "reason" not in mock_hub.kwargs["data"]
+        assert mock_hub.kwargs["level"] == "info"
+        assert "sample-stage-id-submit" in mock_hub.kwargs["message"]
+        assert mock_hub.kwargs["data"]["attemptId"] == 14
+        assert mock_hub.kwargs["data"]["name"] == "run-job"
+        assert "reason" not in mock_hub.kwargs["data"]
 
 
 def test_sentry_listener_on_stage_completed_failure(
-    sentry_listener, mock_add_breadcrumb, get_mock_stage_completed
+    sentry_listener, get_mock_stage_completed
 ):
     listener = sentry_listener
-
-    mock_stage_completed = get_mock_stage_completed(failure_reason=True)
-    listener.onStageCompleted(mock_stage_completed)
-
-    mock_add_breadcrumb.assert_called_once()
-    mock_hub = mock_add_breadcrumb.call_args
-
-    assert mock_hub.kwargs["level"] == "warning"
-    assert "sample-stage-id-submit" in mock_hub.kwargs["message"]
-    assert mock_hub.kwargs["data"]["attemptId"] == 14
-    assert mock_hub.kwargs["data"]["name"] == "run-job"
-    assert mock_hub.kwargs["data"]["reason"] == "failure-reason"
+    with patch.object(listener, "_add_breadcrumb") as mock_add_breadcrumb:
+        mock_stage_completed = get_mock_stage_completed(failure_reason=True)
+        listener.onStageCompleted(mock_stage_completed)
+
+        mock_add_breadcrumb.assert_called_once()
+        mock_hub = mock_add_breadcrumb.call_args
+
+        assert mock_hub.kwargs["level"] == "warning"
+        assert "sample-stage-id-submit" in mock_hub.kwargs["message"]
+        assert mock_hub.kwargs["data"]["attemptId"] == 14
+        assert mock_hub.kwargs["data"]["name"] == "run-job"
+        assert mock_hub.kwargs["data"]["reason"] == "failure-reason"
 
 
 ################