[soc2010/app-loading] store normalized version of INSTALLED_APPS in appcache

arthurk · arthurk · commit 81dc5079638a · 2010-08-11T12:26:15.000Z
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/core/apps.py b/django/core/apps.py
@@ -40,6 +40,11 @@ class AppCache(object):
         # List of App instances
         app_instances = [],
 
+        # Normalized list of INSTALLED_APPS
+        # This stores the module name of settings.INSTALLED_APPS
+        # e.g. 'django.contrib.auth' for 'django.contrib.auth.AuthApp'
+        installed_apps = [],
+
         # Mapping of app_labels to a dictionary of model names to model code.
         app_models = SortedDict(),
 
@@ -105,11 +110,13 @@ def load_app(self, app_name, can_postpone=False):
         app_instance = self.find_app(app_name)
         if not app_instance:
             if '.' in app_name:
+                # get the app label from the full path
                 app_instance_name = app_name.rsplit('.', 1)[1]
             else:
                 app_instance_name = app_name
             app_instance = app_class(app_instance_name)
             self.app_instances.append(app_instance)
+            self.installed_apps.append(app_name)
 
         # check if the app instance specifies a path to models
         # if not, we use the models.py file from the package dir
diff --git a/tests/appcachetests/runtests.py b/tests/appcachetests/runtests.py
@@ -42,6 +42,7 @@ def tearDown(self):
         # because thread.RLock is un(deep)copyable
         cache.app_models = SortedDict()
         cache.app_instances = []
+        cache.installed_apps = []
 
         cache.loaded = False
         cache.handled = {}
@@ -272,6 +273,15 @@ def test_importerror(self):
         """
         self.assertRaises(ImportError, cache.load_app, 'garageland')
 
+    def test_installed_apps(self):
+        """
+        Test that the installed_apps attribute is populated correctly
+        """
+        settings.INSTALLED_APPS = ('model_app', 'nomodel_app.MyApp',)
+        # populate cache
+        cache.get_app_errors()
+        self.assertEqual(cache.installed_apps, ['model_app', 'nomodel_app',])
+
 class RegisterModelsTests(AppCacheTestCase):
     """Tests for the register_models function"""
 
