Stopped iterating on INSTALLED_APPS.

Used the app cache's get_app_configs() method instead.

2 files changed, 21 insertions, 19 deletions

diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/test_loaders.py
index 6e74477e83..551bd7fb72 100644
--- a/tests/template_tests/test_loaders.py
+++ b/tests/template_tests/test_loaders.py
@@ -20,6 +20,7 @@ except ImportError:
     pkg_resources = None
 
 
+from django.core.apps import app_cache
 from django.template import TemplateDoesNotExist, Context
 from django.template.loaders.eggs import Loader as EggLoader
 from django.template import loader
@@ -49,7 +50,6 @@ def create_egg(name, resources):
 
 
 @unittest.skipUnless(pkg_resources, 'setuptools is not installed')
-@override_settings(INSTALLED_APPS=[])
 class EggLoaderTest(TestCase):
     def setUp(self):
         # Defined here b/c at module scope we may not have pkg_resources
@@ -78,29 +78,28 @@ class EggLoaderTest(TestCase):
             os.path.normcase('templates/x.txt'): StringIO("x"),
         })
 
-    @override_settings(INSTALLED_APPS=['egg_empty'])
     def test_empty(self):
         "Loading any template on an empty egg should fail"
-        egg_loader = EggLoader()
-        self.assertRaises(TemplateDoesNotExist, egg_loader.load_template_source, "not-existing.html")
+        with app_cache._with_app('egg_empty'):
+            egg_loader = EggLoader()
+            self.assertRaises(TemplateDoesNotExist, egg_loader.load_template_source, "not-existing.html")
 
-    @override_settings(INSTALLED_APPS=['egg_1'])
     def test_non_existing(self):
         "Template loading fails if the template is not in the egg"
-        egg_loader = EggLoader()
-        self.assertRaises(TemplateDoesNotExist, egg_loader.load_template_source, "not-existing.html")
+        with app_cache._with_app('egg_1'):
+            egg_loader = EggLoader()
+            self.assertRaises(TemplateDoesNotExist, egg_loader.load_template_source, "not-existing.html")
 
-    @override_settings(INSTALLED_APPS=['egg_1'])
     def test_existing(self):
         "A template can be loaded from an egg"
-        egg_loader = EggLoader()
-        contents, template_name = egg_loader.load_template_source("y.html")
-        self.assertEqual(contents, "y")
-        self.assertEqual(template_name, "egg:egg_1:templates/y.html")
+        with app_cache._with_app('egg_1'):
+            egg_loader = EggLoader()
+            contents, template_name = egg_loader.load_template_source("y.html")
+            self.assertEqual(contents, "y")
+            self.assertEqual(template_name, "egg:egg_1:templates/y.html")
 
-    @override_settings(INSTALLED_APPS=[])
     def test_not_installed(self):
-        "Loading an existent template from an egg not included in INSTALLED_APPS should fail"
+        "Loading an existent template from an egg not included in any app should fail"
         egg_loader = EggLoader()
         self.assertRaises(TemplateDoesNotExist, egg_loader.load_template_source, "y.html")
 
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index 651d46d4f1..61a46a81f9 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -16,6 +16,7 @@ import unittest
 import warnings
 
 from django import template
+from django.core.apps import app_cache
 from django.core import urlresolvers
 from django.template import (base as template_base, loader, Context,
     RequestContext, Template, TemplateSyntaxError)
@@ -1873,24 +1874,26 @@ class TemplateTagLoading(TestCase):
             self.assertTrue('ImportError' in e.args[0])
             self.assertTrue('Xtemplate' in e.args[0])
 
-    @override_settings(INSTALLED_APPS=('tagsegg',))
     def test_load_error_egg(self):
         ttext = "{% load broken_egg %}"
         egg_name = '%s/tagsegg.egg' % self.egg_dir
         sys.path.append(egg_name)
-        self.assertRaises(template.TemplateSyntaxError, template.Template, ttext)
+        with self.assertRaises(template.TemplateSyntaxError):
+            with app_cache._with_app('tagsegg'):
+                template.Template(ttext)
         try:
-            template.Template(ttext)
+            with app_cache._with_app('tagsegg'):
+                template.Template(ttext)
         except template.TemplateSyntaxError as e:
             self.assertTrue('ImportError' in e.args[0])
             self.assertTrue('Xtemplate' in e.args[0])
 
-    @override_settings(INSTALLED_APPS=('tagsegg',))
     def test_load_working_egg(self):
         ttext = "{% load working_egg %}"
         egg_name = '%s/tagsegg.egg' % self.egg_dir
         sys.path.append(egg_name)
-        template.Template(ttext)
+        with app_cache._with_app('tagsegg'):
+            template.Template(ttext)
 
 
 class RequestContextTests(unittest.TestCase):