Get rid of custom test runner.

Refs #426.

Author: aaugustin

.travis.yml

@@ -15,4 +15,4 @@ matrix:
       env: DJANGO_VERSION=1.4.8
 install:
   - pip install Django==$DJANGO_VERSION
-script: python setup.py test
+script: make test

Makefile

@@ -1,11 +1,16 @@
 # Make file to compress and join all JS files
 all: compress_js compress_css
 
+.PHONY: flake8 example test compress_js compress_css translatable_strings update_translations
+
 flake8:
-	flake8 *.py debug_toolbar example tests
+	flake8 debug_toolbar example tests
+
+example:
+	PYTHONPATH=. django-admin.py runserver --settings=example.settings
 
 test:
-	python runtests.py
+	PYTHONPATH=. django-admin.py test --settings=tests.settings tests
 
 compress_js:
 	yuicompressor debug_toolbar/static/debug_toolbar/js/jquery.js > debug_toolbar/static/debug_toolbar/js/toolbar.min.js

runtests.py

@@ -16,7 +16,6 @@
         'django>=1.4.2,<1.6',
         'sqlparse',
     ],
-    test_suite='runtests.runtests',
     include_package_data=True,
     zip_safe=False,                 # because we're including static files
     classifiers=[

setup.py

@@ -0,0 +1,12 @@
+# Refresh the debug toolbar's configuration when overriding settings.
+
+from debug_toolbar.utils.settings import CONFIG, CONFIG_DEFAULTS
+from django.dispatch import receiver
+from django.test.signals import setting_changed
+
+
+@receiver(setting_changed)
+def update_toolbar_config(**kwargs):
+    if kwargs['setting'] == 'DEBUG_TOOLBAR_CONFIG':
+        CONFIG.update(CONFIG_DEFAULTS)
+        CONFIG.update(kwargs['value'] or {})

tests/__init__.py

@@ -0,0 +1,58 @@
+"""Django settings for tests."""
+
+import os
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+
+# Quick-start development settings - unsuitable for production
+
+SECRET_KEY = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'
+
+DEBUG = True
+
+INTERNAL_IPS = ['127.0.0.1', '::1']
+
+TEMPLATE_DEBUG = True
+
+
+# Application definition
+
+INSTALLED_APPS = (
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'debug_toolbar',
+    'tests',
+)
+
+MIDDLEWARE_CLASSES = (
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    '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',
+)
+
+ROOT_URLCONF = 'tests.urls'
+
+STATIC_URL = '/static/'
+
+
+# Cache and database
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+    }
+}
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+    }
+}

tests/settings.py

@@ -13,9 +13,10 @@ envlist =
     flake8
 
 [testenv]
-commands = python runtests.py
+commands = make test
 deps =
     sqlparse
+whitelist_externals = make
 
 [testenv:py26-django14]
 basepython = python2.6
@@ -78,6 +79,6 @@ deps =
     {[testenv]deps}
 
 [testenv:flake8]
-commands = flake8 debug_toolbar example tests
+commands = make flake8
 deps =
     flake8