Simplify settings loading a bit. Remove the things which haven't been working for...

[redakcja.git] / src / redakcja / settings / test.py

diff --git a/src/redakcja/settings/test.py b/src/redakcja/settings/test.py
index cd13178..c026af0 100644 (file)
--- a/src/redakcja/settings/test.py
+++ b/src/redakcja/settings/test.py
@@ -2,9 +2,7 @@
 # Nose tests
 #
 
-from redakcja.settings.common import *
-
-# ROOT_URLCONF = 'yourapp.settings.test.urls'
+from redakcja.settings import *
 
 DATABASES = {
     'default': {
@@ -16,7 +14,6 @@ DATABASES = {
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
-
 import tempfile
 
 CATALOGUE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo')
@@ -24,19 +21,7 @@ CATALOGUE_IMAGE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo-img')
 MEDIA_ROOT = tempfile.mkdtemp(prefix='media-root')
 CELERY_ALWAYS_EAGER = True
 
-INSTALLED_APPS += ('django_nose', 'dvcs.tests')
-
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-TEST_MODULES = ('catalogue', 'cover', 'dvcs.tests', 'wiki', 'toolbar')
-COVER_APPS = ('catalogue', 'cover', 'dvcs', 'wiki', 'toolbar')
-NOSE_ARGS = (
-    '--tests=' + ','.join(TEST_MODULES),
-    '--cover-package=' + ','.join(COVER_APPS),
-    '-d',
-    '--with-doctest',
-    '--with-xunit',
-    '--with-xcoverage',
-)
+INSTALLED_APPS += ('dvcs.tests',)
 
 SECRET_KEY = "not-so-secret"