Kaydet (Commit) 9a46836a authored tarafından Tim Graham's avatar Tim Graham

Moved a line outside of try/except to prevent an error in finally.

Thanks Ian Foote.
üst fbb684d9
......@@ -474,9 +474,9 @@ class MakeMigrationsTests(MigrationTestBase):
old_input = questioner.input
questioner.input = lambda _: "N"
stdout = six.StringIO()
merge_file = os.path.join(self.test_dir, 'test_migrations_conflict', '0003_merge.py')
try:
call_command("makemigrations", "migrations", merge=True, stdout=stdout)
merge_file = os.path.join(self.test_dir, 'test_migrations_conflict', '0003_merge.py')
# This will fail if interactive is False by default
self.assertFalse(os.path.exists(merge_file))
except CommandError:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment