test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix app loading/test interaction

This commit is contained in:
Andrew Godwin 2012-09-17 19:57:23 +01:00
parent 3ffbfe4abc
commit dbf8b93c52
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/loading.py
View File

@ -251,7 +251,7 @@ class AppCache(object):
""" """
return { return {
"app_store": SortedDict(self.app_store.items()), "app_store": SortedDict(self.app_store.items()),
"app_labels": dict(self.app_errors.items()), "app_labels": dict(self.app_labels.items()),
"app_models": SortedDict(self.app_models.items()), "app_models": SortedDict(self.app_models.items()),
"app_errors": dict(self.app_errors.items()), "app_errors": dict(self.app_errors.items()),
} }
@ -264,6 +264,7 @@ class AppCache(object):
self.app_labels = state['app_labels'] self.app_labels = state['app_labels']
self.app_models = state['app_models'] self.app_models = state['app_models']
self.app_errors = state['app_errors'] self.app_errors = state['app_errors']
self._get_models_cache.clear()
def temporary_state(self): def temporary_state(self):
"Returns a context manager that restores the state on exit" "Returns a context manager that restores the state on exit"

24
tests/modeltests/schema/tests.py
View File

@ -7,7 +7,7 @@ from django.db import connection, DatabaseError, IntegrityError
from django.db.models.fields import IntegerField, TextField, CharField, SlugField from django.db.models.fields import IntegerField, TextField, CharField, SlugField
from django.db.models.fields.related import ManyToManyField, ForeignKey from django.db.models.fields.related import ManyToManyField, ForeignKey
from django.db.models.loading import cache from django.db.models.loading import cache
from .models import Author, Book, BookWithSlug, BookWithM2M, AuthorWithM2M, Tag, TagUniqueRename, UniqueTest from .models import Author, AuthorWithM2M, Book, BookWithSlug, BookWithM2M, Tag, TagUniqueRename, UniqueTest
class SchemaTests(TestCase): class SchemaTests(TestCase):
@ -19,7 +19,7 @@ class SchemaTests(TestCase):
as the code it is testing. as the code it is testing.
""" """
models = [Author, Book, BookWithSlug, BookWithM2M, AuthorWithM2M, Tag, TagUniqueRename, UniqueTest] models = [Author, AuthorWithM2M, Book, BookWithSlug, BookWithM2M, Tag, TagUniqueRename, UniqueTest]
# Utility functions # Utility functions
@ -30,8 +30,8 @@ class SchemaTests(TestCase):
connection.managed(True) connection.managed(True)
# The unmanaged models need to be removed after the test in order to # The unmanaged models need to be removed after the test in order to
# prevent bad interactions with the flush operation in other tests. # prevent bad interactions with the flush operation in other tests.
self.old_app_models = copy.deepcopy(cache.app_models) self.cache_state = cache.save_state()
self.old_app_store = copy.deepcopy(cache.app_store) cache.load_app("modeltests.schema")
for model in self.models: for model in self.models:
model._meta.managed = True model._meta.managed = True
@ -39,6 +39,16 @@ class SchemaTests(TestCase):
# Rollback anything that may have happened # Rollback anything that may have happened
connection.rollback() connection.rollback()
# Delete any tables made for our models # Delete any tables made for our models
self.delete_tables()
# Unhook our models
for model in self.models:
model._meta.managed = False
if "schema" in self.cache_state['app_labels']:
del self.cache_state['app_labels']['schema']
cache.restore_state(self.cache_state)
def delete_tables(self):
"Deletes all model tables for our models for a clean test environment"
cursor = connection.cursor() cursor = connection.cursor()
connection.disable_constraint_checking() connection.disable_constraint_checking()
for model in self.models: for model in self.models:
@ -62,12 +72,6 @@ class SchemaTests(TestCase):
else: else:
connection.commit() connection.commit()
connection.enable_constraint_checking() connection.enable_constraint_checking()
# Unhook our models
for model in self.models:
model._meta.managed = False
cache.app_models = self.old_app_models
cache.app_store = self.old_app_store
cache._get_models_cache = {}
def column_classes(self, model): def column_classes(self, model):
cursor = connection.cursor() cursor = connection.cursor()