aboutsummaryrefslogtreecommitdiffstats
path: root/conftest.py
diff options
context:
space:
mode:
authorXavier Ordoquy2014-04-17 14:30:33 +0200
committerXavier Ordoquy2014-04-17 14:30:33 +0200
commitc5f68fba0638a15fa3c802f1bafc664e890611dc (patch)
tree47491000edd363be8efafbfbf22751ce2450a3b7 /conftest.py
parentf22ed49c648c6dc3e2cd3c1dfbda77c010189e28 (diff)
downloaddjango-rest-framework-c5f68fba0638a15fa3c802f1bafc664e890611dc.tar.bz2
Fixed the issue with django-filters / django 1.7 / pytest
Diffstat (limited to 'conftest.py')
-rw-r--r--conftest.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/conftest.py b/conftest.py
index b1691a88..7a49845f 100644
--- a/conftest.py
+++ b/conftest.py
@@ -79,3 +79,9 @@ def pytest_configure():
settings.INSTALLED_APPS += (
'guardian',
)
+
+ try:
+ import django
+ django.setup()
+ except AttributeError:
+ pass