diff options
| author | Tim Graham <timograham@gmail.com> | 2014-06-20 09:12:52 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-20 09:13:34 -0400 |
| commit | 9a46836a0c3e15021df242f3dd5a33306f7e27bc (patch) | |
| tree | 4aa87a2b97d7c25aabba0d9b3eb499a77dfb732a | |
| parent | fbb684d95ed71487fe16135321d59ddb043ee903 (diff) | |
Moved a line outside of try/except to prevent an error in finally.
Thanks Ian Foote.
| -rw-r--r-- | tests/migrations/test_commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |