p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.7.x] Cleanup failing test w/contenttypes and remove useless graph load

This commit is contained in:
Andrew Godwin 2014-04-30 15:11:29 -07:00
parent c0d5521e69
commit 6ca5367869
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/management/commands/makemigrations.py
View File

@ -53,8 +53,7 @@ class Command(BaseCommand):
# Load the current graph state. Takes a connection, but it's not used # Load the current graph state. Takes a connection, but it's not used
# (makemigrations doesn't look at the database state). # (makemigrations doesn't look at the database state).
# Also make sure the graph is built without unmigrated apps shoehorned in. # Also make sure the graph is built without unmigrated apps shoehorned in.
loader = MigrationLoader(connections[DEFAULT_DB_ALIAS], load=False) loader = MigrationLoader(connections[DEFAULT_DB_ALIAS])
loader.build_graph()
# Before anything else, see if there's conflicting apps and drop out # Before anything else, see if there's conflicting apps and drop out
# hard if there are any and they don't want to merge # hard if there are any and they don't want to merge

5
tests/migrations/test_state.py
View File

@ -361,7 +361,10 @@ class StateTests(TestCase):
project_state = ProjectState(real_apps=["contenttypes"]) project_state = ProjectState(real_apps=["contenttypes"])
project_state.add_model_state(ModelState.from_model(TestModel)) project_state.add_model_state(ModelState.from_model(TestModel))
rendered_state = project_state.render() rendered_state = project_state.render()
self.assertEqual(len(rendered_state.get_models()), 2) self.assertEqual(
len([x for x in rendered_state.get_models() if x._meta.app_label == "migrations"]),
1,
)
class ModelStateTests(TestCase): class ModelStateTests(TestCase):