Permalink
Browse files

Amended settings and missing requirements for the dev server

  • Loading branch information...
1 parent 007275b commit 0226ac5e8b60c4e70c98729882332a4584eb668e @alfredo alfredo committed Jun 22, 2012
Showing with 9 additions and 15 deletions.
  1. +4 −0 requirements/dev.txt
  2. +5 −15 settings_test.py
View
@@ -7,4 +7,8 @@
# Documentation
Sphinx
+
+# Testing
ipdb
+nose-progressive
+Mock
View
@@ -1,9 +1,6 @@
import os
-if os.environ.get('DJANGO_SITE') == 'ignite':
- from settings_ignite import *
-else:
- from settings import *
+from settings_ignite import *
DEBUG = TEMPLATE_DEBUG = True
@@ -30,18 +27,11 @@
app_list = []
-for app in INSTALLED_APPS:
- conditions = [not app == 'south',
- not 'admin_tools' in app,
- not 'debug_toolbar' in app,
- not 'sentry' in app,
- ]
- if all(conditions):
- app_list.append(app)
-INSTALLED_APPS = app_list
+EXCLUDED_APPS = ('django_mailer', 'south', 'admin_tools',
+ 'debug_toolbar')
+INSTALLED_APPS = filter(lambda a: a not in EXCLUDED_APPS, INSTALLED_APPS)
-# TEST_RUNNER = 'test_utils.runner.RadicalTestSuiteRunner'
NOSE_ARGS = [
'-s',
@@ -50,7 +40,7 @@
'--nocapture',
'--failure-detail',
'--with-progressive',
- # '--with-coverage',
+ '--logging-filter=-south',
]
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'

0 comments on commit 0226ac5

Please sign in to comment.