test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Thanks Ian Foote.
This commit is contained in:
Tim Graham 2014-06-20 09:12:52 -04:00
parent fbb684d95e
commit 9a46836a0c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/migrations/test_commands.py
View File

@ -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: