3 files changed, 9 insertions, 61 deletions
diff --git a/hyperkitty/tests/test_views.py b/hyperkitty/tests/test_views.py
index e29d90b..94ec721 100644
--- a/hyperkitty/tests/test_views.py
+++ b/hyperkitty/tests/test_views.py
@@ -35,8 +35,16 @@ from django.core.urlresolvers import reverse
 from hyperkitty.models import Rating
 
 
+TEST_DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:',
+    }
+}
 
-@override_settings(USE_SSL=False, USE_INTERNAL_AUTH=True)
+
+@override_settings(USE_SSL=False, USE_INTERNAL_AUTH=True, DEBUG=True,
+                   DATABASES=TEST_DATABASES, KITTYSTORE_URL='sqlite:')
 class AccountViewsTestCase(TestCase):
 
     def setUp(self):
diff --git a/hyperkitty/tests_conf/settings_tests.py b/hyperkitty/tests_conf/settings_tests.py
deleted file mode 100644
index efb0aed..0000000
--- a/hyperkitty/tests_conf/settings_tests.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# WARNING: this module is only used to run the unit tests. Do not use it to run
-# HyperKitty, use the hyperkitty_standalone module instead (please see the
-# HyperKitty docs to find it).
-#
-
-import os
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-MAILMAN_API_URL=r'http://%(username)s:%(password)s@localhost:8001/3.0/'
-MAILMAN_USER='mailmanapi'
-MAILMAN_PASS='mailmanpass'
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ':memory:',
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-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',
-    'hyperkitty.lib.store.KittyStoreDjangoMiddleware',
-)
-
-ROOT_URLCONF = 'hyperkitty.tests_conf.urls_test'
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django_gravatar',
-    'hyperkitty',
-)
-
-LOGIN_URL          = '/hyperkitty/accounts/login/'
-KITTYSTORE_URL = 'sqlite:'
-KITTYSTORE_DEBUG=False
-USE_MOCKUPS = False
diff --git a/hyperkitty/tests_conf/urls_test.py b/hyperkitty/tests_conf/urls_test.py
deleted file mode 100644
index c4cd3a0..0000000
--- a/hyperkitty/tests_conf/urls_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import hyperkitty
-
-from django.conf.urls.defaults import *
-
-urlpatterns = patterns('',
-    #url(r'^$', 'hyperkitty.views.pages.index'),
-    (r'^hyperkitty/', include('hyperkitty.urls')),
-	#url(r'', include('social_auth.urls')),
-)