summaryrefslogtreecommitdiff
path: root/tests/managers_regress
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 12:25:17 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 12:25:17 +0100
commit1716b7ce5a02b2a77188dfea2d41e25dfa58821c (patch)
treef3422c0d6725f45756a3b9deb32406d319b8a72e /tests/managers_regress
parente9e522a8e7455900a775678e5d6bc518a289b8d1 (diff)
downloaddjango-1716b7ce5a02b2a77188dfea2d41e25dfa58821c.tar.gz
Renamed AppCache to Apps.
Also renamed app_cache to apps and "app cache" to "app registry". Deprecated AppCache.app_cache_ready() in favor of Apps.ready().
Diffstat (limited to 'tests/managers_regress')
-rw-r--r--tests/managers_regress/tests.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/managers_regress/tests.py b/tests/managers_regress/tests.py
index bf8e5b17d4..8e0b4cd017 100644
--- a/tests/managers_regress/tests.py
+++ b/tests/managers_regress/tests.py
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from django.apps import app_cache
+from django.apps import apps
from django.db import models
from django.template import Context, Template
from django.test import TestCase, override_settings
@@ -110,7 +110,7 @@ class ManagersRegressionTests(TestCase):
def test_swappable_manager(self):
# The models need to be removed after the test in order to prevent bad
# interactions with the flush operation in other tests.
- _old_models = app_cache.app_configs['managers_regress'].models.copy()
+ _old_models = apps.app_configs['managers_regress'].models.copy()
try:
class SwappableModel(models.Model):
@@ -126,15 +126,15 @@ class ManagersRegressionTests(TestCase):
self.assertEqual(str(e), "Manager isn't available; SwappableModel has been swapped for 'managers_regress.Parent'")
finally:
- app_cache.app_configs['managers_regress'].models = _old_models
- app_cache.all_models['managers_regress'] = _old_models
- app_cache.get_models.cache_clear()
+ apps.app_configs['managers_regress'].models = _old_models
+ apps.all_models['managers_regress'] = _old_models
+ apps.get_models.cache_clear()
@override_settings(TEST_SWAPPABLE_MODEL='managers_regress.Parent')
def test_custom_swappable_manager(self):
# The models need to be removed after the test in order to prevent bad
# interactions with the flush operation in other tests.
- _old_models = app_cache.app_configs['managers_regress'].models.copy()
+ _old_models = apps.app_configs['managers_regress'].models.copy()
try:
class SwappableModel(models.Model):
@@ -154,15 +154,15 @@ class ManagersRegressionTests(TestCase):
self.assertEqual(str(e), "Manager isn't available; SwappableModel has been swapped for 'managers_regress.Parent'")
finally:
- app_cache.app_configs['managers_regress'].models = _old_models
- app_cache.all_models['managers_regress'] = _old_models
- app_cache.get_models.cache_clear()
+ apps.app_configs['managers_regress'].models = _old_models
+ apps.all_models['managers_regress'] = _old_models
+ apps.get_models.cache_clear()
@override_settings(TEST_SWAPPABLE_MODEL='managers_regress.Parent')
def test_explicit_swappable_manager(self):
# The models need to be removed after the test in order to prevent bad
# interactions with the flush operation in other tests.
- _old_models = app_cache.app_configs['managers_regress'].models.copy()
+ _old_models = apps.app_configs['managers_regress'].models.copy()
try:
class SwappableModel(models.Model):
@@ -182,9 +182,9 @@ class ManagersRegressionTests(TestCase):
self.assertEqual(str(e), "Manager isn't available; SwappableModel has been swapped for 'managers_regress.Parent'")
finally:
- app_cache.app_configs['managers_regress'].models = _old_models
- app_cache.all_models['managers_regress'] = _old_models
- app_cache.get_models.cache_clear()
+ apps.app_configs['managers_regress'].models = _old_models
+ apps.all_models['managers_regress'] = _old_models
+ apps.get_models.cache_clear()
def test_regress_3871(self):
related = RelatedModel.objects.create()