summaryrefslogtreecommitdiff
path: root/tests/defer_regress
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2015-11-17 00:39:28 -0500
committerSimon Charette <charette.s@gmail.com>2016-01-06 20:00:07 -0500
commita08fda2111d811aa53f11218fa03f3300dfff4cb (patch)
tree0263cf99adf17c5123b3a53c686f637d5b40eda4 /tests/defer_regress
parent3096f4b0829a005c67a14cc4bb6d345aa32672a1 (diff)
downloaddjango-a08fda2111d811aa53f11218fa03f3300dfff4cb.tar.gz
Fixed #25746 -- Isolated inlined test models registration.
Thanks to Tim for the review.
Diffstat (limited to 'tests/defer_regress')
-rw-r--r--tests/defer_regress/tests.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/defer_regress/tests.py b/tests/defer_regress/tests.py
index cc1658ce58..ffb0b6e775 100644
--- a/tests/defer_regress/tests.py
+++ b/tests/defer_regress/tests.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
from operator import attrgetter
from django.apps import apps
-from django.apps.registry import Apps
from django.contrib.contenttypes.models import ContentType
from django.contrib.sessions.backends.db import SessionStore
from django.db import models
@@ -12,6 +11,7 @@ from django.db.models.query_utils import (
DeferredAttribute, deferred_class_factory,
)
from django.test import TestCase, override_settings
+from django.test.utils import isolate_apps
from .models import (
Base, Child, Derived, Feature, Item, ItemAndSimpleItem, Leaf, Location,
@@ -265,22 +265,20 @@ class DeferRegressionTest(TestCase):
deferred_cls = deferred_class_factory(Item, ())
self.assertFalse(deferred_cls._deferred)
- def test_deferred_class_factory_apps_reuse(self):
+ @isolate_apps('defer_regress', kwarg_name='apps')
+ def test_deferred_class_factory_apps_reuse(self, apps):
"""
#25563 - model._meta.apps should be used for caching and
retrieval of the created proxy class.
"""
- isolated_apps = Apps(['defer_regress'])
-
class BaseModel(models.Model):
field = models.BooleanField()
class Meta:
- apps = isolated_apps
app_label = 'defer_regress'
deferred_model = deferred_class_factory(BaseModel, ['field'])
- self.assertIs(deferred_model._meta.apps, isolated_apps)
+ self.assertIs(deferred_model._meta.apps, apps)
self.assertIs(deferred_class_factory(BaseModel, ['field']), deferred_model)