bugfix

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

diff --git a/src/redakcja/settings/test.py b/src/redakcja/settings/test.py
index cd13178..4a80142 100644 (file)
--- a/src/redakcja/settings/test.py
+++ b/src/redakcja/settings/test.py
@@ -1,10 +1,9 @@
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.

 #
 #

-# Nose tests
-#
-
-from redakcja.settings.common import *
+import tempfile
+from redakcja.settings import *

 
 

-# ROOT_URLCONF = 'yourapp.settings.test.urls'

 
 DATABASES = {
     'default': {
 
 DATABASES = {
     'default': {


@@ -17,26 +16,11 @@ DATABASES = {
     }
 }
 
     }
 }
 

-import tempfile
-

 CATALOGUE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo')
 CATALOGUE_IMAGE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo-img')
 MEDIA_ROOT = tempfile.mkdtemp(prefix='media-root')
 CATALOGUE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo')
 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"
 
 
 SECRET_KEY = "not-so-secret"