From 2f435e75ab4923c50f0999a77dfc26cff4429deb Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 23 Apr 2021 10:06:08 +0200 Subject: [PATCH] Fixed isolation of test_showmigrations_unmigrated_app(). Follow up to 90916f050c64b817fdf2ea13b5c20986005fd029. --- tests/migrations/test_commands.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index 00d4de1ff1..b253192a56 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -670,7 +670,15 @@ class MigrateTests(MigrationTestBase): def test_showmigrations_plan_app_label_no_migrations(self): out = io.StringIO() call_command('showmigrations', 'unmigrated_app', format='plan', stdout=out, no_color=True) - self.assertEqual('(no migrations)\n', out.getvalue()) + try: + self.assertEqual('(no migrations)\n', out.getvalue()) + finally: + # unmigrated_app.SillyModel has a foreign key to + # 'migrations.Tribble', but that model is only defined in a + # migration, so the global app registry never sees it and the + # reference is left dangling. Remove it to avoid problems in + # subsequent tests. + apps._pending_operations.pop(('migrations', 'tribble'), None) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"}) def test_sqlmigrate_forwards(self):