aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2015-03-16 09:18:08 +0000
committerTom Christie2015-03-16 09:18:08 +0000
commit1c0db6dda8235bc0bfab2370ea6c6d0fd08a1da5 (patch)
tree432c7fc962db1dc8beed5a524dcb9a008f2e59f6
parentb41808b79adb6f51d55c580012b66d420edaed4a (diff)
parent76ede5beda74c1bb224f038d635ab586416bfca8 (diff)
downloaddjango-rest-framework-1c0db6dda8235bc0bfab2370ea6c6d0fd08a1da5.tar.bz2
Merge pull request #2697 from jpadilla/tests
Simplify test settings
-rw-r--r--tests/conftest.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 44ed070b..03b4e328 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,7 +18,6 @@ def pytest_configure():
MIDDLEWARE_CLASSES=(
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
),
@@ -27,7 +26,6 @@ def pytest_configure():
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
- 'django.contrib.messages',
'django.contrib.staticfiles',
'rest_framework',
@@ -35,12 +33,7 @@ def pytest_configure():
'tests',
),
PASSWORD_HASHERS=(
- 'django.contrib.auth.hashers.SHA1PasswordHasher',
- 'django.contrib.auth.hashers.PBKDF2PasswordHasher',
- 'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
- 'django.contrib.auth.hashers.BCryptPasswordHasher',
'django.contrib.auth.hashers.MD5PasswordHasher',
- 'django.contrib.auth.hashers.CryptPasswordHasher',
),
)