Merge branch 'production' of github.com:fnp/redakcja into production

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

diff --git a/redakcja/settings/test.py b/redakcja/settings/test.py
index f6e9080..717de29 100644 (file)
--- a/redakcja/settings/test.py
+++ b/redakcja/settings/test.py
@@ -6,22 +6,32 @@ from redakcja.settings.common import *
 
 # ROOT_URLCONF = 'yourapp.settings.test.urls'
 
 
 # ROOT_URLCONF = 'yourapp.settings.test.urls'
 

-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = ':memory:'
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': '', # Or path to database file if using sqlite3.
+        '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.
+    }
+}

 
 import tempfile
 
 
 import tempfile
 

-CATALOGUE_REPO_PATH = tempfile.mkdtemp(prefix='wikirepo')
+CATALOGUE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo')
+MEDIA_ROOT = tempfile.mkdtemp(prefix='media-root')
+USE_CELERY = False

 
 

-INSTALLED_APPS += ('django_nose',)
+INSTALLED_APPS += ('django_nose', 'dvcs.tests')

 
 

-TEST_RUNNER = 'django_nose.run_tests'
-TEST_MODULES = ('catalogue', 'dvcs.tests', 'wiki', 'toolbar')
+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),
 NOSE_ARGS = (
     '--tests=' + ','.join(TEST_MODULES),

-    '--cover-package=' + ','.join(TEST_MODULES),
+    '--cover-package=' + ','.join(COVER_APPS),

     '-d',
     '-d',

-    '--with-coverage',

     '--with-doctest',
     '--with-xunit',
     '--with-xcoverage',
     '--with-doctest',
     '--with-xunit',
     '--with-xcoverage',