Get rid of custom test runner.

Refs #426.

7 files changed, 81 insertions, 81 deletions

diff --git a/.travis.yml b/.travis.yml
index f1d2e29..90c42cc 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Makefile b/Makefile
index 1ea5f38..22832c1 100644
--- a/Makefile
+++ b/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
diff --git a/runtests.py b/runtests.py
deleted file mode 100644
index bed16aa..0000000
--- a/runtests.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env python
-import sys
-import os
-from os.path import dirname, abspath
-from optparse import OptionParser
-
-from django.conf import settings, global_settings
-
-# For convenience configure settings if they are not pre-configured or if we
-# haven't been provided settings to use by environment variable.
-if not settings.configured and not os.environ.get('DJANGO_SETTINGS_MODULE'):
-    settings.configure(
-        DATABASES={
-            'default': {
-                'ENGINE': 'django.db.backends.sqlite3',
-            }
-        },
-        INSTALLED_APPS=[
-            'django.contrib.auth',
-            'django.contrib.admin',
-            'django.contrib.contenttypes',
-            'django.contrib.sessions',
-            'django.contrib.sites',
-
-            'debug_toolbar',
-
-            'tests',
-        ],
-        MIDDLEWARE_CLASSES=global_settings.MIDDLEWARE_CLASSES + (
-            'debug_toolbar.middleware.DebugToolbarMiddleware',
-        ),
-        ROOT_URLCONF='',
-        DEBUG=False,
-        SITE_ID=1,
-    )
-
-
-# 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_connections_time_zone(**kwargs):
-    if kwargs['setting'] == 'DEBUG_TOOLBAR_CONFIG':
-        CONFIG.update(CONFIG_DEFAULTS)
-        CONFIG.update(kwargs['value'] or {})
-
-
-from django.test.simple import DjangoTestSuiteRunner
-
-
-def runtests(*test_args, **kwargs):
-    if 'south' in settings.INSTALLED_APPS:
-        from south.management.commands import patch_for_test_db_setup
-        patch_for_test_db_setup()
-
-    if not test_args:
-        test_args = ['tests']
-    parent = dirname(abspath(__file__))
-    sys.path.insert(0, parent)
-    test_runner = DjangoTestSuiteRunner(verbosity=kwargs.get('verbosity', 1),
-                                        interactive=kwargs.get('interactive', False),
-                                        failfast=kwargs.get('failfast'))
-    failures = test_runner.run_tests(test_args)
-    sys.exit(failures)
-
-if __name__ == '__main__':
-    parser = OptionParser()
-    parser.add_option('--failfast', action='store_true', default=False, dest='failfast')
-
-    (options, args) = parser.parse_args()
-
-    runtests(failfast=options.failfast, *args)
diff --git a/setup.py b/setup.py
index 93d71b4..f9258e8 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,6 @@ setup(
         '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=[
diff --git a/tests/__init__.py b/tests/__init__.py
index e69de29..3b83e4c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.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 {})
diff --git a/tests/settings.py b/tests/settings.py
new file mode 100644
index 0000000..2d993f5
--- /dev/null
+++ b/tests/settings.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',
+    }
+}
diff --git a/tox.ini b/tox.ini
index c69a566..8a6caa9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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