From bbfe3662e2b5b364a81d507dfe19e4dc4cd40d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Thu, 15 Aug 2013 19:31:30 -0400
Subject: [PATCH] Enable the django_nose app by default

The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
---
 cms/envs/common.py | 5 ++++-
 cms/envs/test.py   | 1 -
 lms/envs/common.py | 2 +-
 lms/envs/test.py   | 2 --
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 9d246edece..d91e2aeeba 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -332,6 +332,9 @@ INSTALLED_APPS = (
     # Monitor the status of services
     'service_status',
 
+    # Testing
+    'django_nose',
+
     # For CMS
     'contentstore',
     'auth',
@@ -339,7 +342,7 @@ INSTALLED_APPS = (
     'student',  # misleading name due to sharing with lms
     'course_groups',  # not used in cms (yet), but tests run
 
-    # tracking
+    # Tracking
     'track',
 
     # For asset pipelining
diff --git a/cms/envs/test.py b/cms/envs/test.py
index 4f3b0caee0..ffbf9f5376 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -18,7 +18,6 @@ from path import path
 from warnings import filterwarnings
 
 # Nose Test Runner
-INSTALLED_APPS += ('django_nose',)
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 TEST_ROOT = path('test_root')
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 3e65c70805..250552a40c 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -758,6 +758,7 @@ INSTALLED_APPS = (
 
     # For testing
     'django.contrib.admin',  # only used in DEBUG mode
+    'django_nose',
     'debug',
 
     # Discussion forums
@@ -816,4 +817,3 @@ def enable_theme(theme_name):
     # avoid collisions with default edX static files
     STATICFILES_DIRS.append((u'themes/%s' % theme_name,
                              theme_root / 'static'))
-
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 704c78b177..bf2df444f4 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -39,8 +39,6 @@ WIKI_ENABLED = True
 SOUTH_TESTS_MIGRATE = False   # To disable migrations and use syncdb instead
 
 # Nose Test Runner
-INSTALLED_APPS += ('django_nose',)
-
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Local Directories