Merge pull request #494 from django-debug-toolbar/staticfiles

Added staticfiles panel class.

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/settings.py b/tests/settings.py
index 24e0cd4..68346ff 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -1,6 +1,8 @@
 """Django settings for tests."""
 
 import os
+import django
+
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 
@@ -40,6 +42,8 @@ ROOT_URLCONF = 'tests.urls'
 
 STATIC_URL = '/static/'
 
+STATICFILES_DIRS = [os.path.join(BASE_DIR, 'tests', 'additional_static')]
+
 
 # Cache and database
 
@@ -62,3 +66,6 @@ DEBUG_TOOLBAR_CONFIG = {
     # Django's test client sets wsgi.multiprocess to True inappropriately
     'RENDER_PANELS': False,
 }
+
+if django.VERSION[:2] < (1, 6):
+    TEST_RUNNER = 'discover_runner.DiscoverRunner'