Removed override_template_loaders and override_with_test_loader.

They can be replaced with override_settings and that makes the
corresponding tests much more obvious.

2 files changed, 12 insertions, 7 deletions

diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py
index e50a29f1d1..b9987c72b0 100644
--- a/tests/view_tests/tests/test_debug.py
+++ b/tests/view_tests/tests/test_debug.py
@@ -17,7 +17,6 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.urlresolvers import reverse
 from django.template.base import TemplateDoesNotExist
 from django.test import TestCase, RequestFactory, override_settings
-from django.test.utils import override_with_test_loader
 from django.utils.encoding import force_text, force_bytes
 from django.utils import six
 from django.views.debug import CallableSettingWrapper, ExceptionReporter
@@ -66,14 +65,17 @@ class DebugViewTests(TestCase):
 
     def test_403(self):
         # Ensure no 403.html template exists to test the default case.
-        with override_with_test_loader({}):
+        with override_settings(TEMPLATE_LOADERS=[]):
             response = self.client.get('/raises403/')
             self.assertContains(response, '<h1>403 Forbidden</h1>', status_code=403)
 
     def test_403_template(self):
         # Set up a test 403.html template.
-        with override_with_test_loader({'403.html': 'This is a test template '
-                                        'for a 403 Forbidden error.'}):
+        with override_settings(TEMPLATE_LOADERS=[
+            ('django.template.loaders.locmem.Loader', {
+                '403.html': 'This is a test template for a 403 Forbidden error.',
+            })
+        ]):
             response = self.client.get('/raises403/')
             self.assertContains(response, 'test template', status_code=403)
 
diff --git a/tests/view_tests/tests/test_defaults.py b/tests/view_tests/tests/test_defaults.py
index 1f6a554c19..6a3a495c23 100644
--- a/tests/view_tests/tests/test_defaults.py
+++ b/tests/view_tests/tests/test_defaults.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
 from django.test import TestCase
-from django.test.utils import override_settings, override_with_test_loader
+from django.test.utils import override_settings
 
 from ..models import UrlArticle
 
@@ -40,9 +40,12 @@ class DefaultsTests(TestCase):
         Test that 404.html and 500.html templates are picked by their respective
         handler.
         """
-        with override_with_test_loader({
+        with override_settings(TEMPLATE_LOADERS=[
+            ('django.template.loaders.locmem.Loader', {
                 '404.html': 'This is a test template for a 404 error.',
-                '500.html': 'This is a test template for a 500 error.'}):
+                '500.html': 'This is a test template for a 500 error.',
+            }),
+        ]):
             for code, url in ((404, '/non_existing_url/'), (500, '/server_error/')):
                 response = self.client.get(url)
                 self.assertContains(response, "test template for a %d error" % code,