Merge pull request #1486 from MITx/feature/ned/clean_up_tests

We no longer need override_settings, Django has a better one.

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -1,7 +1,7 @@
 import json
 import shutil
 from django.test.client import Client
-from override_settings import override_settings
+from django.test.utils import override_settings
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from path import path

cms/djangoapps/contentstore/tests/tests.py

@@ -1,7 +1,6 @@
 import json
 import shutil
 from django.test.client import Client
-from override_settings import override_settings
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from path import path

cms/djangoapps/contentstore/tests/utils.py

@@ -2,7 +2,6 @@ import json
 import copy
 from time import time
 from django.test import TestCase
-from override_settings import override_settings
 from django.conf import settings
 
 from student.models import Registration

common/djangoapps/course_groups/tests/tests.py

@@ -2,7 +2,7 @@ import django.test
 from django.contrib.auth.models import User
 from django.conf import settings
 
-from override_settings import override_settings
+from django.test.utils import override_settings
 
 from course_groups.models import CourseUserGroup
 from course_groups.cohorts import (get_cohort, get_course_cohorts,

common/djangoapps/status/tests.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.test import TestCase
 import os
-from override_settings import override_settings
+from django.test.utils import override_settings
 from tempfile import NamedTemporaryFile
 
 from status import get_site_status_msg

lms/djangoapps/course_wiki/tests/tests.py

@@ -1,5 +1,5 @@
 from django.core.urlresolvers import reverse
-from override_settings import override_settings
+from django.test.utils import override_settings
 
 import xmodule.modulestore.django
 

lms/djangoapps/courseware/tests/tests.py

@@ -11,7 +11,7 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from override_settings import override_settings
+from django.test.utils import override_settings
 
 import xmodule.modulestore.django
 from xmodule.modulestore.mongo import MongoModuleStore

lms/djangoapps/django_comment_client/tests.py

@@ -6,7 +6,7 @@ from django.conf import settings
 
 from mock import Mock
 
-from override_settings import override_settings
+from django.test.utils import override_settings
 
 import xmodule.modulestore.django
 

lms/djangoapps/instructor/tests.py

@@ -15,7 +15,7 @@ import json
 from nose import SkipTest
 from mock import patch, Mock
 
-from override_settings import override_settings
+from django.test.utils import override_settings
 
 # Need access to internal func to put users in the right group
 from django.contrib.auth.models import Group

lms/djangoapps/open_ended_grading/tests.py

@@ -22,7 +22,7 @@ from mitxmako.shortcuts import render_to_string
 
 import logging
 log = logging.getLogger(__name__)
-from override_settings import override_settings
+from django.test.utils import override_settings
 from django.http import QueryDict
 
 

requirements.txt

@@ -24,7 +24,6 @@ django_nose
 nosexcover==1.0.7
 rednose==0.3.3
 GitPython==0.3.2.RC1
-django-override-settings==1.2
 mock==0.8.0
 PyYAML==3.10
 South==0.7.6