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

Fixed #21115 -- Fixed NameError in migrate --list command

This commit is contained in:
Markus Holtermann 2013-09-17 11:54:55 +02:00 committed by Tim Graham
parent 2c6079775e
commit a772ea8117
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/management/commands/migrate.py
View File

@ -264,7 +264,7 @@ class Command(BaseCommand):
if apps:
invalid_apps = []
for app in apps:
if app_label not in loader.migrated_apps:
if app not in loader.migrated_apps:
invalid_apps.append(app)
if invalid_apps:
raise CommandError("No migrations present for: %s" % (", ".join(invalid_apps)))

22
tests/migrations/test_commands.py
View File

@ -48,6 +48,28 @@ class MigrateTests(MigrationTestBase):
self.assertTableNotExists("migrations_tribble")
self.assertTableNotExists("migrations_book")
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"})
def test_migrate_list(self):
"""
Tests --list output of migrate command
"""
stdout = six.StringIO()
call_command("migrate", list=True, stdout=stdout, verbosity=0)
self.assertIn("migrations", stdout.getvalue().lower())
self.assertIn("[ ] 0001_initial", stdout.getvalue().lower())
self.assertIn("[ ] 0002_second", stdout.getvalue().lower())
call_command("migrate", "migrations", "0001", verbosity=0)
stdout = six.StringIO()
# Giving the explicit app_label tests for selective `show_migration_list` in the command
call_command("migrate", "migrations", list=True, stdout=stdout, verbosity=0)
self.assertIn("migrations", stdout.getvalue().lower())
self.assertIn("[x] 0001_initial", stdout.getvalue().lower())
self.assertIn("[ ] 0002_second", stdout.getvalue().lower())
# Cleanup by unmigrating everything
call_command("migrate", "migrations", "zero", verbosity=0)
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"})
def test_sqlmigrate(self):
"""