mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[soc2010/app-loading] raise ImproperlyConfigured when trying to register models to an app that isnt listed in INSTALLED_APPS

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Arthur Koziel 2010-08-11 11:15:00 +00:00
parent 2b7bfaccf2
commit 467441587c
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/core/apps.py
View File

@ -173,12 +173,8 @@ class AppCache(object):
def get_apps(self): def get_apps(self):
"Returns a list of all installed modules that contain models." "Returns a list of all installed modules that contain models."
self._populate() self._populate()
# Ensure the returned list is always in the same order (with new apps
# added at the end). This avoids unstable ordering on the admin app
# list page, for example.
return [app.models_module for app in self.app_instances\ return [app.models_module for app in self.app_instances\
if app.models_module] if hasattr(app, 'models_module')]
def get_app(self, app_label, emptyOK=False): def get_app(self, app_label, emptyOK=False):
""" """
@ -266,13 +262,10 @@ class AppCache(object):
Register a set of models as belonging to an app. Register a set of models as belonging to an app.
""" """
app_instance = self.find_app(app_label) app_instance = self.find_app(app_label)
# Create a new App instance if the ModelBase tries to register
# an app that isn't listed in INSTALLED_APPS
if not app_instance: if not app_instance:
app_instance = App(app_label) raise ImproperlyConfigured('Could not find App instance with label "%s". '
self.app_instances.append(app_instance) 'Please check your INSTALLED_APPS setting'
% app_label)
for model in models: for model in models:
# Store as 'name: model' pair in a dictionary # Store as 'name: model' pair in a dictionary
# in the models list of the App instance # in the models list of the App instance

63
tests/appcachetests/runtests.py
View File

@ -5,12 +5,11 @@ import threading
from django.conf import settings from django.conf import settings
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.core.apps import MultipleInstancesReturned from django.core.apps import cache, MultipleInstancesReturned
# remove when tests are integrated into the django testsuite # remove when tests are integrated into the django testsuite
settings.configure() settings.configure()
from django.db.models.loading import cache
class AppCacheTestCase(unittest.TestCase): class AppCacheTestCase(unittest.TestCase):
""" """
@ -41,9 +40,9 @@ class AppCacheTestCase(unittest.TestCase):
# we cannot copy() the whole cache.__dict__ in the setUp function # we cannot copy() the whole cache.__dict__ in the setUp function
# because thread.RLock is un(deep)copyable # because thread.RLock is un(deep)copyable
cache.app_store = SortedDict()
cache.app_models = SortedDict() cache.app_models = SortedDict()
cache.app_errors = {} cache.app_instances = []
cache.loaded = False cache.loaded = False
cache.handled = {} cache.handled = {}
cache.postponed = [] cache.postponed = []
@ -51,8 +50,6 @@ class AppCacheTestCase(unittest.TestCase):
cache.write_lock = threading.RLock() cache.write_lock = threading.RLock()
cache._get_models_cache = {} cache._get_models_cache = {}
cache.app_instances = []
class AppCacheReadyTests(AppCacheTestCase): class AppCacheReadyTests(AppCacheTestCase):
""" """
Tests for the app_cache_ready function that indicates if the cache Tests for the app_cache_ready function that indicates if the cache
@ -65,9 +62,9 @@ class AppCacheReadyTests(AppCacheTestCase):
def test_load_app(self): def test_load_app(self):
"""Should return False after executing the load_app function""" """Should return False after executing the load_app function"""
cache.load_app('django.contrib.comments') cache.load_app('nomodel_app')
self.assertFalse(cache.app_cache_ready()) self.assertFalse(cache.app_cache_ready())
cache.load_app('django.contrib.comments', can_postpone=True) cache.load_app('nomodel_app', can_postpone=True)
self.assertFalse(cache.app_cache_ready()) self.assertFalse(cache.app_cache_ready())
class GetAppsTests(AppCacheTestCase): class GetAppsTests(AppCacheTestCase):
@ -75,12 +72,16 @@ class GetAppsTests(AppCacheTestCase):
def test_get_apps(self): def test_get_apps(self):
"""Test that the correct models modules are returned""" """Test that the correct models modules are returned"""
settings.INSTALLED_APPS = ('django.contrib.auth', settings.INSTALLED_APPS = ('django.contrib.sites',
'django.contrib.contenttypes',
'django.contrib.auth',
'django.contrib.flatpages',) 'django.contrib.flatpages',)
apps = cache.get_apps() apps = cache.get_apps()
self.assertEqual(len(apps), 2) self.assertEqual(len(apps), 4)
self.assertTrue(apps[0], 'django.contrib.auth.models') self.assertTrue(apps[0], 'django.contrib.auth.models')
self.assertTrue(apps[1], 'django.contrib.flatpages.models') self.assertTrue(apps[1], 'django.contrib.flatpages.models')
self.assertTrue(apps[2], 'django.contrib.sites.models')
self.assertTrue(apps[3], 'django.contrib.contenttypes.models')
self.assertTrue(cache.app_cache_ready()) self.assertTrue(cache.app_cache_ready())
def test_empty_models(self): def test_empty_models(self):
@ -94,7 +95,8 @@ class GetAppTests(AppCacheTestCase):
def test_get_app(self): def test_get_app(self):
"""Test that the correct module is returned""" """Test that the correct module is returned"""
settings.INSTALLED_APPS = ('django.contrib.auth',) settings.INSTALLED_APPS = ('django.contrib.contenttypes',
'django.contrib.auth',)
module = cache.get_app('auth') module = cache.get_app('auth')
self.assertTrue(module, 'django.contrib.auth.models') self.assertTrue(module, 'django.contrib.auth.models')
self.assertTrue(cache.app_cache_ready()) self.assertTrue(cache.app_cache_ready())
@ -141,9 +143,10 @@ class GetModelsTests(AppCacheTestCase):
def test_get_models(self): def test_get_models(self):
"""Test that the correct model classes are returned""" """Test that the correct model classes are returned"""
settings.INSTALLED_APPS = ('django.contrib.flatpages',) settings.INSTALLED_APPS = ('django.contrib.sites',
from django.contrib.flatpages.models import Site, FlatPage 'django.contrib.flatpages',)
models = cache.get_models() models = cache.get_models()
from django.contrib.flatpages.models import Site, FlatPage
self.assertEqual(len(models), 2) self.assertEqual(len(models), 2)
self.assertEqual(models[0], Site) self.assertEqual(models[0], Site)
self.assertEqual(models[1], FlatPage) self.assertEqual(models[1], FlatPage)
@ -154,7 +157,11 @@ class GetModelsTests(AppCacheTestCase):
Test that the correct model classes are returned if an Test that the correct model classes are returned if an
app module is specified app module is specified
""" """
settings.INSTALLED_APPS = ('django.contrib.flatpages',) settings.INSTALLED_APPS = ('django.contrib.sites',
'django.contrib.flatpages',)
# populate cache
cache.get_app_errors()
from django.contrib.flatpages import models from django.contrib.flatpages import models
from django.contrib.flatpages.models import FlatPage from django.contrib.flatpages.models import FlatPage
rv = cache.get_models(app_mod=models) rv = cache.get_models(app_mod=models)
@ -164,9 +171,10 @@ class GetModelsTests(AppCacheTestCase):
def test_include_auto_created(self): def test_include_auto_created(self):
"""Test that auto created models are included if specified""" """Test that auto created models are included if specified"""
settings.INSTALLED_APPS = ('django.contrib.flatpages',) settings.INSTALLED_APPS = ('django.contrib.sites',
from django.contrib.flatpages.models import Site, FlatPage 'django.contrib.flatpages',)
models = cache.get_models(include_auto_created=True) models = cache.get_models(include_auto_created=True)
from django.contrib.flatpages.models import Site, FlatPage
self.assertEqual(len(models), 3) self.assertEqual(len(models), 3)
self.assertEqual(models[0], Site) self.assertEqual(models[0], Site)
self.assertEqual(models[1].__name__, 'FlatPage_sites') self.assertEqual(models[1].__name__, 'FlatPage_sites')
@ -181,9 +189,11 @@ class GetModelTests(AppCacheTestCase):
def test_get_model(self): def test_get_model(self):
"""Test that the correct model is returned""" """Test that the correct model is returned"""
settings.INSTALLED_APPS = ('django.contrib.flatpages',) settings.INSTALLED_APPS = ('django.contrib.sites',
'django.contrib.flatpages',)
rv = cache.get_model('flatpages', 'FlatPage')
from django.contrib.flatpages.models import FlatPage from django.contrib.flatpages.models import FlatPage
self.assertEqual(cache.get_model('flatpages', 'FlatPage'), FlatPage) self.assertEqual(rv, FlatPage)
self.assertTrue(cache.app_cache_ready()) self.assertTrue(cache.app_cache_ready())
def test_invalid(self): def test_invalid(self):
@ -278,16 +288,17 @@ class RegisterModelsTests(AppCacheTestCase):
self.assertEqual(len(cache.app_instances), 1) self.assertEqual(len(cache.app_instances), 1)
self.assertEqual(app.models[0].__name__, 'Person') self.assertEqual(app.models[0].__name__, 'Person')
def test_new_instance(self): def test_app_not_installed(self):
""" """
Test a new app instance is created if one doesn't exist, and the Test that an exception is raised if models are tried to be registered
models are attached to it. to an app that isn't listed in INSTALLED_APPS.
""" """
from model_app.models import Person try:
app = cache.app_instances[0] from model_app.models import Person
self.assertEqual(len(cache.app_instances), 1) except ImproperlyConfigured:
self.assertEqual(app.name, 'model_app') pass
self.assertEqual(app.models[0].__name__, 'Person') else:
self.fail('ImproperlyConfigured not raised')
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()