Move to a runtests.py file for tests.

.travis.yml

@@ -3,19 +3,18 @@ python:
   - "2.6"
   - "2.7"
   - "3.4"
-
 install:
-  - pip install .
+  - pip install coverage
   - pip install $DJANGO
 script:
-  - django-admin.py test tos --settings=tos.tests.test_settings
+  - coverage run runtests.py
+  - coverage report -m
 env:
   - DJANGO="Django==1.4.12"
   - DJANGO="Django==1.5"
   - DJANGO="Django==1.5.7"
   - DJANGO="Django==1.6.4"
   - DJANGO="Django==1.7.11"
-
 matrix:
   exclude:
     # Python 2.6 support has been dropped in Django 1.7

runtests.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+import sys
+
+import django
+
+from django.conf import settings
+from django.core.management import execute_from_command_line
+
+
+if not settings.configured:
+    settings.configure(
+        DATABASES={
+            'default': {
+                'ENGINE': 'django.db.backends.sqlite3',
+            }
+        },
+        INSTALLED_APPS=[
+            'django.contrib.auth',
+            'django.contrib.contenttypes',
+            'django.contrib.sessions',
+            'django.contrib.messages',
+            'django.contrib.sites',
+            'tos',
+        ],
+        MIDDLEWARE_CLASSES=[
+            'django.middleware.common.CommonMiddleware',
+            'django.contrib.sessions.middleware.SessionMiddleware',
+            'django.middleware.csrf.CsrfViewMiddleware',
+            'django.contrib.auth.middleware.AuthenticationMiddleware',
+            'django.contrib.messages.middleware.MessageMiddleware',  
+        ],
+        ROOT_URLCONF='tos.tests.test_urls',
+        TEST_RUNNER='django.test.runner.DiscoverRunner',
+        LOGIN_URL='/login/'
+    )
+
+
+# Django 1.7 compatibility:
+if hasattr(django, 'setup'):
+    django.setup()
+
+
+def runtests():
+    argv = sys.argv[:1] + ['test'] + sys.argv[1:]
+    execute_from_command_line(argv)
+
+
+if __name__ == '__main__':
+    runtests()

tos/tests/test_settings.py

@@ -1,64 +0,0 @@
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-SITE_ID = 1
-SECRET_KEY = 'foobarbaz'
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'mydatabase'
-    }
-}
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.media',
-    'django.core.context_processors.static',
-    'django.core.context_processors.tz',
-    'django.core.context_processors.request',
-    'django.contrib.messages.context_processors.messages',
-)
-
-INSTALLED_APPS = (
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.sites',
-    'tos',
-)
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.app_directories.Loader',
-    'django.template.loaders.eggs.Loader',
-)
-
-ROOT_URLCONF = 'tos.tests.test_urls'
-
-LOGIN_URL = '/login/'
-
-import logging
-logging.basicConfig(
-    level = logging.DEBUG,
-    format = '%(asctime)s %(levelname)s %(message)s',
-)
-
-
-# Django 1.7 compatibility:
-import django
-if hasattr(django, 'setup'):
-    django.setup()
-
-if django.VERSION > (1, 6):
-    TEST_RUNNER = 'django.test.runner.DiscoverRunner'