Test with and without executing

Author: alexmojaki

sentry_sdk/integrations/django/__init__.py

@@ -157,7 +157,7 @@ def process_django_templates(event, hint):
                     for i in reversed(range(len(frames))):
                         f = frames[i]
                         if (
-                            f.get("function") in ("Parser.parse", "render")
+                            f.get("function") in ("Parser.parse", "parse", "render")
                             and f.get("module") == "django.template.base"
                         ):
                             i += 1

test-requirements.txt

@@ -7,4 +7,3 @@ pytest-cov==2.8.1
 gevent
 eventlet
 newrelic
-executing

tests/integrations/django/test_basic.py

@@ -17,6 +17,7 @@
 
 from sentry_sdk import capture_message, capture_exception
 from sentry_sdk.integrations.django import DjangoIntegration
+from sentry_sdk.utils import executing
 
 from tests.integrations.django.myapp.wsgi import application
 
@@ -437,11 +438,19 @@ def test_template_exception(sentry_init, client, capture_events):
     filenames = [
         (f.get("function"), f.get("module")) for f in exception["stacktrace"]["frames"]
     ]
-    assert filenames[-3:] == [
-        (u"Parser.parse", u"django.template.base"),
-        (None, None),
-        (u"Parser.invalid_block_tag", u"django.template.base"),
-    ]
+
+    if executing:
+        assert filenames[-3:] == [
+            (u"Parser.parse", u"django.template.base"),
+            (None, None),
+            (u"Parser.invalid_block_tag", u"django.template.base"),
+        ]
+    else:
+        assert filenames[-3:] == [
+            (u"parse", u"django.template.base"),
+            (None, None),
+            (u"invalid_block_tag", u"django.template.base"),
+        ]
 
 
 @pytest.mark.parametrize(

tests/test_client.py

@@ -10,7 +10,7 @@
 from sentry_sdk import Hub, Client, configure_scope, capture_message, capture_exception
 from sentry_sdk.transport import Transport
 from sentry_sdk._compat import reraise, text_type, PY2
-from sentry_sdk.utils import HAS_CHAINED_EXCEPTIONS
+from sentry_sdk.utils import HAS_CHAINED_EXCEPTIONS, executing
 
 if PY2:
     # Importing ABCs from collections is deprecated, and will stop working in 3.8
@@ -224,10 +224,14 @@ def bar():
     (event,) = events
     (thread,) = event["threads"]["values"]
     functions = [x["function"] for x in thread["stacktrace"]["frames"]]
-    assert functions[-2:] == [
-        "test_attach_stacktrace_enabled.<locals>.foo",
-        "test_attach_stacktrace_enabled.<locals>.bar",
-    ]
+
+    if executing:
+        assert functions[-2:] == [
+            "test_attach_stacktrace_enabled.<locals>.foo",
+            "test_attach_stacktrace_enabled.<locals>.bar",
+        ]
+    else:
+        assert functions[-2:] == ["foo", "bar"]
 
 
 def test_attach_stacktrace_enabled_no_locals():

tox.ini

@@ -20,7 +20,9 @@ envlist =
     #   {py2.7}-django-{1.11}
     #   {py2.7,py3.7}-django-{1.11,2.2}
 
-    {pypy,py2.7}-django-{1.6,1.7}
+    py{2.7,3.4,3.5,3.6,3.7,3.8,py}-executing
+
+    {pypy,py2.7}-django-{1.6,1.7}{-executing,}
     {pypy,py2.7,py3.5}-django-{1.8,1.9,1.10,1.11}
     {py3.5,py3.6,py3.7}-django-{2.0,2.1}
     {py3.7,py3.8}-django-{2.2,3.0,dev}
@@ -181,6 +183,8 @@ deps =
 
     py3.8: hypothesis
 
+    executing: executing
+
 setenv =
     PYTHONDONTWRITEBYTECODE=1
     TESTPATH=tests