[django] fix test compatibility for Django 2.0

Author: Emanuele Palazzetti

tests/contrib/django/app/settings.py

@@ -69,7 +69,7 @@
     },
 ]
 
-if django.VERSION >= (1, 10):
+if (1, 10) <= django.VERSION < (2, 0):
     MIDDLEWARE = [
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.middleware.common.CommonMiddleware',
@@ -82,6 +82,21 @@
 
         'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
     ]
+
+# Django 2.0 has different defaults
+if django.VERSION >= (2, 0):
+    MIDDLEWARE = [
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.middleware.security.SecurityMiddleware',
+
+        'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
+    ]
+
 # Always add the legacy conf to make sure we handle it properly
 # Pre 1.10 style
 MIDDLEWARE_CLASSES = [

tests/contrib/django/compat.py

@@ -0,0 +1,4 @@
+try:
+    from django.core.urlresolvers import reverse
+except ImportError:
+    from django.urls import reverse

tests/contrib/django/test_cache_views.py

@@ -3,9 +3,8 @@
 # 3rd party
 from nose.tools import eq_, ok_
 
-from django.core.urlresolvers import reverse
-
 # testing
+from .compat import reverse
 from .utils import DjangoTraceTestCase
 
 

tests/contrib/django/test_middleware.py

@@ -2,14 +2,14 @@
 from nose.tools import eq_
 
 from django.test import modify_settings
-from django.core.urlresolvers import reverse
 
 # project
 from ddtrace.constants import SAMPLING_PRIORITY_KEY
 from ddtrace.contrib.django.conf import settings
 from ddtrace.contrib.django import TraceMiddleware
 
 # testing
+from .compat import reverse
 from .utils import DjangoTraceTestCase, override_ddtrace_settings
 
 

tests/contrib/djangorestframework/app/settings.py

@@ -55,6 +55,20 @@
         'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
     ]
 
+# Django 2.0 has different defaults
+if django.VERSION >= (2, 0):
+    MIDDLEWARE = [
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.middleware.security.SecurityMiddleware',
+
+        'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
+    ]
+
 # Always add the legacy conf to make sure we handle it properly
 # Pre 1.10 style
 MIDDLEWARE_CLASSES = [