Forráskód Böngészése

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

Thanks Ian Foote.
Tim Graham 10 éve
szülő
commit
9a46836a0c
1 módosított fájl, 1 hozzáadás és 1 törlés
  1. 1 1
      tests/migrations/test_commands.py

+ 1 - 1
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: