mirror of
https://github.com/django/django.git
synced 2025-11-25 05:04:26 +00:00
Deborgified the app cache.
Improved Andrew's hack to create temporary app caches to handle migrations. Now the main app cache has a "master" flag set to True (which is a non-default keyword argument, thus unlikely to be used by mistake). Other app cache instances have "master" set to False. The only sanctioned way to access the app cache is by importing django.core.apps.app_cache. If you were instanciating an app cache and relying on the Borg pattern, you'll have to refactor your code.
This commit is contained in:
parent
6e895f9e06
commit
0242c56fd8
12 changed files with 71 additions and 87 deletions
|
|
@ -75,17 +75,14 @@ class EggLoadingTest(TestCase):
|
|||
Test that repeated app loading doesn't succeed in case there is an
|
||||
error. Refs #17667.
|
||||
"""
|
||||
# AppCache is a Borg, so we can instantiate one and change its
|
||||
# loaded to False to force the following code to actually try to
|
||||
# populate the cache.
|
||||
a = AppCache()
|
||||
a.loaded = False
|
||||
try:
|
||||
with override_settings(INSTALLED_APPS=('notexists',)):
|
||||
self.assertRaises(ImportError, app_cache.get_model, 'notexists', 'nomodel', seed_cache=True)
|
||||
self.assertRaises(ImportError, app_cache.get_model, 'notexists', 'nomodel', seed_cache=True)
|
||||
finally:
|
||||
a.loaded = True
|
||||
app_cache = AppCache()
|
||||
# Pretend we're the master app cache to test populate().
|
||||
app_cache.master = True
|
||||
with override_settings(INSTALLED_APPS=('notexists',)):
|
||||
with self.assertRaises(ImportError):
|
||||
app_cache.get_model('notexists', 'nomodel', seed_cache=True)
|
||||
with self.assertRaises(ImportError):
|
||||
app_cache.get_model('notexists', 'nomodel', seed_cache=True)
|
||||
|
||||
|
||||
class GetModelsTest(TestCase):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue