Added optional debug-toolbar to test suite.

bartTC · Apr 30, 2017 · 1ad5686 · 1ad5686
1 parent c7c69f7
commit 1ad5686
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,13 @@ env:
   - DJANGO=1.9.*
   - DJANGO=1.10.*
   - DJANGO=1.11.*
+  - TEST_WITH_DEBUGTOOLBAR=on DJANGO=1.8.*
+  - TEST_WITH_DEBUGTOOLBAR=on DJANGO=1.9.*
+  - TEST_WITH_DEBUGTOOLBAR=on DJANGO=1.10.*
+  - TEST_WITH_DEBUGTOOLBAR=on DJANGO=1.11.*
 
 install:
+  - pip install django-debug-toolbar
   - pip install django==$DJANGO
   - pip install -e .
 

diff --git a/runtests.py b/runtests.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import os
 import sys
 from django.conf import settings
 
@@ -9,24 +10,24 @@
             'NAME': ':memory:',
         },
     },
-    'INSTALLED_APPS': (
+    'INSTALLED_APPS': [
         'memcache_status',
         'django.contrib.admin',
         'django.contrib.auth',
         'django.contrib.contenttypes',
         'django.contrib.sessions',
-    ),
+    ],
     'ROOT_URLCONF': 'memcache_status.tests.urls',
     'CACHES': {
         'default': {
             'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
             'LOCATION': '127.0.0.1:11211',
         }
     },
-    'MIDDLEWARE_CLASSES': (
+    'MIDDLEWARE_CLASSES': [
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
-    ),
+    ],
     'TEMPLATES': [
         {
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -43,6 +44,14 @@
     ]
 }
 
+
+if os.getenv('TEST_WITH_DEBUGTOOLBAR', False) == 'on':
+    sys.stdout.write('Testing with django-debug-toolbar support.\n')
+    SETTINGS['INSTALLED_APPS'].insert(0, 'debug_toolbar')
+    SETTINGS['MIDDLEWARE_CLASSES'].append('debug_toolbar.middleware.DebugToolbarMiddleware')
+    SETTINGS['INTERNAL_IPS'] = ['127.0.0.1']
+
+
 def runtests(*test_args):
     # Setup settings
     if not settings.configured:

diff --git a/setup.py b/setup.py
@@ -43,7 +43,7 @@ def run_tests(self):
         'python-memcached>=1.57',
     ],
     tests_require=[
-        'tox>=1.6.1',
+        'tox>=2.0',
     ],
     cmdclass={
         'test': Tox

diff --git a/tox.ini b/tox.ini
@@ -2,14 +2,17 @@
 toxworkdir=/tmp/tox/django-memcache-status
 skip_missing_interpreters=True
 envlist=
-    py{27,35,36}-django-{18,19,110,111}
+    py{27,35,36}-django-{18,19,110,111}-{regular,debugtoolbar}
 
 [testenv]
 commands=
-    python runtests.py
+    {envpython} runtests.py
+
+setenv:
+    debugtoolbar: TEST_WITH_DEBUGTOOLBAR=on
 
 deps=
-    # Django versions
+    debugtoolbar: django-debug-toolbar
     django-18: django==1.8.*
     django-19: django==1.9.*
     django-110: django==1.10.*