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

Removed try/fail antipattern from migrations commands tests.

This commit is contained in:
Tim Graham 2016-04-27 10:16:07 -04:00
parent c6b83db299
commit 6729b96d8a
1 changed files with 29 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
tests/migrations/test_commands.py
View File

@ -598,10 +598,7 @@ class MakeMigrationsTests(MigrationTestBase):
""" """
out = six.StringIO() out = six.StringIO()
with self.temporary_migration_module(module="migrations.test_migrations"): with self.temporary_migration_module(module="migrations.test_migrations"):
try: call_command("makemigrations", merge=True, stdout=out)
call_command("makemigrations", merge=True, stdout=out)
except CommandError:
self.fail("Makemigrations errored in merge mode with no conflicts")
self.assertIn("No conflicts detected to merge.", out.getvalue()) self.assertIn("No conflicts detected to merge.", out.getvalue())
def test_makemigrations_no_app_sys_exit(self): def test_makemigrations_no_app_sys_exit(self):
@ -625,10 +622,7 @@ class MakeMigrationsTests(MigrationTestBase):
Makes sure that makemigrations properly constructs an empty migration. Makes sure that makemigrations properly constructs an empty migration.
""" """
with self.temporary_migration_module() as migration_dir: with self.temporary_migration_module() as migration_dir:
try: call_command("makemigrations", "migrations", empty=True, verbosity=0)
call_command("makemigrations", "migrations", empty=True, verbosity=0)
except CommandError:
self.fail("Makemigrations errored in creating empty migration for a proper app.")
# Check for existing 0001_initial.py file in migration folder # Check for existing 0001_initial.py file in migration folder
initial_file = os.path.join(migration_dir, "0001_initial.py") initial_file = os.path.join(migration_dir, "0001_initial.py")
@ -710,13 +704,10 @@ class MakeMigrationsTests(MigrationTestBase):
""" """
# Monkeypatch interactive questioner to auto reject # Monkeypatch interactive questioner to auto reject
with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='N')): with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='N')):
try: with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir:
with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir: call_command("makemigrations", "migrations", merge=True, interactive=True, verbosity=0)
call_command("makemigrations", "migrations", merge=True, interactive=True, verbosity=0) merge_file = os.path.join(migration_dir, '0003_merge.py')
merge_file = os.path.join(migration_dir, '0003_merge.py') self.assertFalse(os.path.exists(merge_file))
self.assertFalse(os.path.exists(merge_file))
except CommandError:
self.fail("Makemigrations failed while running interactive questioner")
def test_makemigrations_interactive_accept(self): def test_makemigrations_interactive_accept(self):
""" """
@ -725,13 +716,10 @@ class MakeMigrationsTests(MigrationTestBase):
# Monkeypatch interactive questioner to auto accept # Monkeypatch interactive questioner to auto accept
with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='y')): with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='y')):
out = six.StringIO() out = six.StringIO()
try: with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir:
with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir: call_command("makemigrations", "migrations", merge=True, interactive=True, stdout=out)
call_command("makemigrations", "migrations", merge=True, interactive=True, stdout=out) merge_file = os.path.join(migration_dir, '0003_merge.py')
merge_file = os.path.join(migration_dir, '0003_merge.py') self.assertTrue(os.path.exists(merge_file))
self.assertTrue(os.path.exists(merge_file))
except CommandError:
self.fail("Makemigrations failed while running interactive questioner")
self.assertIn("Created new merge migration", force_text(out.getvalue())) self.assertIn("Created new merge migration", force_text(out.getvalue()))
def test_makemigrations_non_interactive_not_null_addition(self): def test_makemigrations_non_interactive_not_null_addition(self):
@ -763,11 +751,8 @@ class MakeMigrationsTests(MigrationTestBase):
app_label = "migrations" app_label = "migrations"
out = six.StringIO() out = six.StringIO()
try: with self.temporary_migration_module(module="migrations.test_migrations"):
with self.temporary_migration_module(module="migrations.test_migrations"): call_command("makemigrations", "migrations", interactive=False, stdout=out)
call_command("makemigrations", "migrations", interactive=False, stdout=out)
except CommandError:
self.fail("Makemigrations failed while running non-interactive questioner.")
self.assertIn("Alter field slug on author", force_text(out.getvalue())) self.assertIn("Alter field slug on author", force_text(out.getvalue()))
def test_makemigrations_non_interactive_no_model_rename(self): def test_makemigrations_non_interactive_no_model_rename(self):
@ -781,11 +766,8 @@ class MakeMigrationsTests(MigrationTestBase):
app_label = "migrations" app_label = "migrations"
out = six.StringIO() out = six.StringIO()
try: with self.temporary_migration_module(module="migrations.test_migrations_no_default"):
with self.temporary_migration_module(module="migrations.test_migrations_no_default"): call_command("makemigrations", "migrations", interactive=False, stdout=out)
call_command("makemigrations", "migrations", interactive=False, stdout=out)
except CommandError:
self.fail("Makemigrations failed while running non-interactive questioner")
self.assertIn("Delete model SillyModel", force_text(out.getvalue())) self.assertIn("Delete model SillyModel", force_text(out.getvalue()))
self.assertIn("Create model RenamedModel", force_text(out.getvalue())) self.assertIn("Create model RenamedModel", force_text(out.getvalue()))
@ -800,11 +782,8 @@ class MakeMigrationsTests(MigrationTestBase):
app_label = "migrations" app_label = "migrations"
out = six.StringIO() out = six.StringIO()
try: with self.temporary_migration_module(module="migrations.test_migrations_no_default"):
with self.temporary_migration_module(module="migrations.test_migrations_no_default"): call_command("makemigrations", "migrations", interactive=False, stdout=out)
call_command("makemigrations", "migrations", interactive=False, stdout=out)
except CommandError:
self.fail("Makemigrations failed while running non-interactive questioner")
self.assertIn("Remove field silly_field from sillymodel", force_text(out.getvalue())) self.assertIn("Remove field silly_field from sillymodel", force_text(out.getvalue()))
self.assertIn("Add field silly_rename to sillymodel", force_text(out.getvalue())) self.assertIn("Add field silly_rename to sillymodel", force_text(out.getvalue()))
@ -948,14 +927,11 @@ class MakeMigrationsTests(MigrationTestBase):
# Monkeypatch interactive questioner to auto reject # Monkeypatch interactive questioner to auto reject
out = six.StringIO() out = six.StringIO()
with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='N')): with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='N')):
try: with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir:
with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir: call_command("makemigrations", "migrations", merge=True, stdout=out)
call_command("makemigrations", "migrations", merge=True, stdout=out) merge_file = os.path.join(migration_dir, '0003_merge.py')
merge_file = os.path.join(migration_dir, '0003_merge.py') # This will fail if interactive is False by default
# This will fail if interactive is False by default self.assertFalse(os.path.exists(merge_file))
self.assertFalse(os.path.exists(merge_file))
except CommandError:
self.fail("Makemigrations failed while running interactive questioner")
self.assertNotIn("Created new merge migration", out.getvalue()) self.assertNotIn("Created new merge migration", out.getvalue())
@override_settings( @override_settings(
@ -967,11 +943,8 @@ class MakeMigrationsTests(MigrationTestBase):
Makes sure that makemigrations does not raise a CommandError when an Makes sure that makemigrations does not raise a CommandError when an
unspecified app has conflicting migrations. unspecified app has conflicting migrations.
""" """
try: with self.temporary_migration_module(module="migrations.test_migrations_no_changes"):
with self.temporary_migration_module(module="migrations.test_migrations_no_changes"): call_command("makemigrations", "migrations", merge=False, verbosity=0)
call_command("makemigrations", "migrations", merge=False, verbosity=0)
except CommandError:
self.fail("Makemigrations fails resolving conflicts in an unspecified app")
@override_settings( @override_settings(
INSTALLED_APPS=[ INSTALLED_APPS=[
@ -985,14 +958,11 @@ class MakeMigrationsTests(MigrationTestBase):
# Monkeypatch interactive questioner to auto accept # Monkeypatch interactive questioner to auto accept
with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='y')): with mock.patch('django.db.migrations.questioner.input', mock.Mock(return_value='y')):
out = six.StringIO() out = six.StringIO()
try: with self.temporary_migration_module(app_label="migrated_app") as migration_dir:
with self.temporary_migration_module(app_label="migrated_app") as migration_dir: call_command("makemigrations", "migrated_app", merge=True, interactive=True, stdout=out)
call_command("makemigrations", "migrated_app", merge=True, interactive=True, stdout=out) merge_file = os.path.join(migration_dir, '0003_merge.py')
merge_file = os.path.join(migration_dir, '0003_merge.py') self.assertFalse(os.path.exists(merge_file))
self.assertFalse(os.path.exists(merge_file)) self.assertIn("No conflicts detected to merge.", out.getvalue())
self.assertIn("No conflicts detected to merge.", out.getvalue())
except CommandError:
self.fail("Makemigrations fails resolving conflicts in an unspecified app")
@override_settings( @override_settings(
INSTALLED_APPS=[ INSTALLED_APPS=[
@ -1034,10 +1004,7 @@ class MakeMigrationsTests(MigrationTestBase):
with self.temporary_migration_module() as migration_dir: with self.temporary_migration_module() as migration_dir:
def cmd(migration_count, migration_name, *args): def cmd(migration_count, migration_name, *args):
try: call_command("makemigrations", "migrations", "--verbosity", "0", "--name", migration_name, *args)
call_command("makemigrations", "migrations", "--verbosity", "0", "--name", migration_name, *args)
except CommandError:
self.fail("Makemigrations errored in creating empty migration with custom name for a proper app.")
migration_file = os.path.join(migration_dir, "%s_%s.py" % (migration_count, migration_name)) migration_file = os.path.join(migration_dir, "%s_%s.py" % (migration_count, migration_name))
# Check for existing migration file in migration folder # Check for existing migration file in migration folder
self.assertTrue(os.path.exists(migration_file)) self.assertTrue(os.path.exists(migration_file))