diff --git a/tests/integrations/django/myapp/urls.py b/tests/integrations/django/myapp/urls.py index 87d11b791b..e1d0c4c90c 100644 --- a/tests/integrations/django/myapp/urls.py +++ b/tests/integrations/django/myapp/urls.py @@ -149,7 +149,6 @@ def path(path, *args, **kwargs): name="rest_framework_read_body_and_exc", ) ) - urlpatterns.append(path("rest-hello", views.rest_hello, name="rest_hello")) urlpatterns.append( path( "rest-authenticated-hello", diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py index 21f27455a5..f926ddd1a6 100644 --- a/tests/integrations/django/myapp/views.py +++ b/tests/integrations/django/myapp/views.py @@ -49,10 +49,6 @@ def rest_framework_read_body_and_exc(request): request.data 1 / 0 - @api_view(["GET"]) - def rest_hello(request): - return HttpResponse("ok") - @api_view(["GET"]) def rest_permission_denied_exc(request): raise PermissionDenied("bye") diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py index 93b5477010..e5afa91dad 100644 --- a/tests/integrations/django/test_basic.py +++ b/tests/integrations/django/test_basic.py @@ -47,50 +47,34 @@ def client(): return Client(application) -@pytest.mark.parametrize("span_streaming", [True, False]) def test_view_exceptions( sentry_init, client, capture_exceptions, - capture_events, capture_items, - span_streaming, ): sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream" if span_streaming else "static", ) exceptions = capture_exceptions() - if span_streaming: - items = capture_items("event") - client.get(reverse("view_exc")) + items = capture_items("event") + client.get(reverse("view_exc")) - (error,) = exceptions - assert isinstance(error, ZeroDivisionError) - - (event,) = (item.payload for item in items) - else: - events = capture_events() - client.get(reverse("view_exc")) - - (error,) = exceptions - assert isinstance(error, ZeroDivisionError) + (error,) = exceptions + assert isinstance(error, ZeroDivisionError) - (event,) = events + (event,) = (item.payload for item in items) assert event["exception"]["values"][0]["mechanism"]["type"] == "django" -@pytest.mark.parametrize("span_streaming", [True, False]) def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django( sentry_init, client, capture_exceptions, - capture_events, capture_items, settings, - span_streaming, ): """ Test that ensures if django settings.USE_X_FORWARDED_HOST is set to True @@ -101,37 +85,24 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream" if span_streaming else "static", ) exceptions = capture_exceptions() - if span_streaming: - items = capture_items("event") - client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}) + items = capture_items("event") + client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}) - (error,) = exceptions - assert isinstance(error, ZeroDivisionError) - - (event,) = (item.payload for item in items) - else: - events = capture_events() - client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}) - - (error,) = exceptions - assert isinstance(error, ZeroDivisionError) + (error,) = exceptions + assert isinstance(error, ZeroDivisionError) - (event,) = events + (event,) = (item.payload for item in items) assert event["request"]["url"] == "http://example.com/view-exc" -@pytest.mark.parametrize("span_streaming", [True, False]) def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django( sentry_init, client, capture_exceptions, - capture_events, capture_items, - span_streaming, ): """ Test that ensures if django settings.USE_X_FORWARDED_HOST is set to False @@ -140,23 +111,14 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream" if span_streaming else "static", ) exceptions = capture_exceptions() - if span_streaming: - items = capture_items("event") - client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}) - - (error,) = exceptions - assert isinstance(error, ZeroDivisionError) - (event,) = (item.payload for item in items) - else: - events = capture_events() - client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}) + items = capture_items("event") + client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}) - (error,) = exceptions - assert isinstance(error, ZeroDivisionError) - (event,) = events + (error,) = exceptions + assert isinstance(error, ZeroDivisionError) + (event,) = (item.payload for item in items) assert event["request"]["url"] == "http://localhost/view-exc" @@ -183,43 +145,22 @@ def test_request_captured( send_default_pii=True, trace_lifecycle="stream" if span_streaming else "static", ) - if span_streaming: - items = capture_items("event") - content, status, headers = unpack_werkzeug_response( - client.get(reverse("message")) - ) - - assert content == b"ok" - - (event,) = (item.payload for item in items) + items = capture_items("event") + content, status, headers = unpack_werkzeug_response(client.get(reverse("message"))) - assert event["transaction"] == "/message" - assert event["request"] == { - "cookies": {}, - "env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"}, - "headers": {"Host": "localhost"}, - "method": "GET", - "query_string": "", - "url": "http://localhost/message", - } - else: - events = capture_events() - content, status, headers = unpack_werkzeug_response( - client.get(reverse("message")) - ) + assert content == b"ok" - assert content == b"ok" + (event,) = (item.payload for item in items) - (event,) = events - assert event["transaction"] == "/message" - assert event["request"] == { - "cookies": {}, - "env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"}, - "headers": {"Host": "localhost"}, - "method": "GET", - "query_string": "", - "url": "http://localhost/message", - } + assert event["transaction"] == "/message" + assert event["request"] == { + "cookies": {}, + "env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"}, + "headers": {"Host": "localhost"}, + "method": "GET", + "query_string": "", + "url": "http://localhost/message", + } @pytest.mark.parametrize("span_streaming", [True, False]) @@ -535,7 +476,6 @@ def test_user_captured( def test_materialized_user_captured( sentry_init, client, - capture_events, capture_items, ): sentry_init( @@ -565,39 +505,24 @@ def test_materialized_user_captured( @pytest.mark.forked @pytest_mark_django_db_decorator() -@pytest.mark.parametrize("span_streaming", [True, False]) def test_queryset_repr( sentry_init, - capture_events, capture_items, - span_streaming, ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream" if span_streaming else "static", ) User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword") - if span_streaming: - items = capture_items("event") + items = capture_items("event") - try: - my_queryset = User.objects.all() # noqa - 1 / 0 - except Exception: - capture_exception() - - (event,) = (item.payload for item in items) - else: - events = capture_events() + try: + my_queryset = User.objects.all() # noqa + 1 / 0 + except Exception: + capture_exception() - try: - my_queryset = User.objects.all() # noqa - 1 / 0 - except Exception: - capture_exception() - - (event,) = events + (event,) = (item.payload for item in items) (exception,) = event["exception"]["values"] assert exception["type"] == "ZeroDivisionError" @@ -609,38 +534,23 @@ def test_queryset_repr( @pytest.mark.forked @pytest_mark_django_db_decorator() -@pytest.mark.parametrize("span_streaming", [True, False]) def test_context_nested_queryset_repr( sentry_init, - capture_events, capture_items, - span_streaming, ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream" if span_streaming else "static", ) User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword") - if span_streaming: - items = capture_items("event") - - try: - context = make_context({"entries": User.objects.all()}) # noqa - 1 / 0 - except Exception: - capture_exception() + items = capture_items("event") - (event,) = (item.payload for item in items) - else: - events = capture_events() - - try: - context = make_context({"entries": User.objects.all()}) # noqa - 1 / 0 - except Exception: - capture_exception() + try: + context = make_context({"entries": User.objects.all()}) # noqa + 1 / 0 + except Exception: + capture_exception() - (event,) = events + (event,) = (item.payload for item in items) (exception,) = event["exception"]["values"] assert exception["type"] == "ZeroDivisionError" @@ -648,30 +558,19 @@ def test_context_nested_queryset_repr( assert "