Commit 9a46836a authored by Tim Graham's avatar Tim Graham
Browse files

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

Thanks Ian Foote.
parent fbb684d9

tests/migrations/test_commands.py

+1 −1
Original line number Diff line number Diff line
@@ -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: