From 9a46836a0c3e15021df242f3dd5a33306f7e27bc Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 20 Jun 2014 09:12:52 -0400 Subject: [PATCH] Moved a line outside of try/except to prevent an error in finally. Thanks Ian Foote. --- tests/migrations/test_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index 6ba92f87dd..7895259ccd 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -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: