diff --git a/cms/envs/common.py b/cms/envs/common.py index 9d246edece9d..d91e2aeebafc 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -332,6 +332,9 @@ # Monitor the status of services 'service_status', + # Testing + 'django_nose', + # For CMS 'contentstore', 'auth', @@ -339,7 +342,7 @@ '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 4f3b0caee003..ffbf9f5376d2 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -18,7 +18,6 @@ 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 3e65c7080545..250552a40cd1 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -758,6 +758,7 @@ # 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 704c78b1774a..bf2df444f4dd 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -39,8 +39,6 @@ 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