Revert "Use proper test app path for custom urlconf"

sl0thentr0py · sl0thentr0py · commit a76b8b76d368 · 2022-01-17T12:35:37.000+01:00
This reverts commit 02191d1.
diff --git a/tests/integrations/django/myapp/custom_urls.py b/tests/integrations/django/myapp/custom_urls.py
@@ -1,20 +1,15 @@
 from __future__ import absolute_import
 
-try:
-    from django.urls import path
-except ImportError:
-    from django.conf.urls import url
-
-    def path(path, *args, **kwargs):
-        return url("^{}$".format(path), *args, **kwargs)
+import django
 
+if django.VERSION >= (2, 0):
+    # TODO: once we stop supporting django < 2, use the real name of this
+    # function (re_path)
+    from django.urls import re_path as url
+else:
+    from django.conf.urls import url
 
-from . import views
 
 urlpatterns = [
-    path(
-        "foo/bar/baz/<int:param>/",
-        views.postgres_select_custom,
-        name="postgres_select_custom",
-    ),
+    url(r"^foo/bar/baz/(?P<param>[\d]+)", lambda x: ""),
 ]
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
@@ -136,15 +136,6 @@ def postgres_select(request, *args, **kwargs):
     return HttpResponse("ok")
 
 
-@csrf_exempt
-def postgres_select_custom(request, *args, **kwargs):
-    from django.db import connections
-
-    cursor = connections["postgres"].cursor()
-    cursor.execute("SELECT 1;")
-    return HttpResponse("ok")
-
-
 @csrf_exempt
 def permission_denied_exc(*args, **kwargs):
     raise PermissionDenied("bye")
diff --git a/tests/integrations/django/test_transactions.py b/tests/integrations/django/test_transactions.py
@@ -66,15 +66,14 @@ def test_legacy_resolver_newstyle_django20_urlconf():
 def test_legacy_resolver_custom_urlconf_module_name():
     resolver = RavenResolver()
     custom_urlconf_module = "tests.integrations.django.myapp.custom_urls"
-    result = resolver.resolve("/foo/bar/baz/1234/", custom_urlconf_module)
-    assert result == "/foo/bar/baz/{param}/"
+    result = resolver.resolve("/foo/bar/baz/1234", custom_urlconf_module)
+    assert result == "/foo/bar/baz/{param}"
 
 
-@pytest.mark.only
 def test_legacy_resolver_custom_urlconf_callback():
     def custom_urlconf_callback():
         return "tests.integrations.django.myapp.custom_urls"
 
     resolver = RavenResolver()
-    result = resolver.resolve("/foo/bar/baz/1234/", custom_urlconf_callback)
-    assert result == "/foo/bar/baz/{param}/"
+    result = resolver.resolve("/foo/bar/baz/1234", custom_urlconf_callback)
+    assert result == "/foo/bar/baz/{param}"
