diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/migrations/test_executor.py | 20 | ||||
| -rw-r--r-- | tests/migrations/test_loader.py | 12 |
2 files changed, 23 insertions, 9 deletions
diff --git a/tests/migrations/test_executor.py b/tests/migrations/test_executor.py index 8bb4f83c5f..ddba8d12e8 100644 --- a/tests/migrations/test_executor.py +++ b/tests/migrations/test_executor.py @@ -711,7 +711,11 @@ class ExecutorUnitTests(SimpleTestCase): graph.add_dependency(None, a2, a1) executor = MigrationExecutor(None) - executor.loader = FakeLoader(graph, {a1, b1, a2}) + executor.loader = FakeLoader(graph, { + a1: a1_impl, + b1: b1_impl, + a2: a2_impl, + }) plan = executor.migration_plan({a1}) @@ -754,7 +758,14 @@ class ExecutorUnitTests(SimpleTestCase): graph.add_dependency(None, b2, a2) executor = MigrationExecutor(None) - executor.loader = FakeLoader(graph, {a1, b1, a2, b2, a3, a4}) + executor.loader = FakeLoader(graph, { + a1: a1_impl, + b1: b1_impl, + a2: a2_impl, + b2: b2_impl, + a3: a3_impl, + a4: a4_impl, + }) plan = executor.migration_plan({a1}) @@ -791,7 +802,10 @@ class ExecutorUnitTests(SimpleTestCase): graph.add_dependency(None, c1, a1) executor = MigrationExecutor(None) - executor.loader = FakeLoader(graph, {a1, b1}) + executor.loader = FakeLoader(graph, { + a1: a1_impl, + b1: b1_impl, + }) plan = executor.migration_plan({a1}) diff --git a/tests/migrations/test_loader.py b/tests/migrations/test_loader.py index e3a635dc63..0f0a590e7c 100644 --- a/tests/migrations/test_loader.py +++ b/tests/migrations/test_loader.py @@ -265,7 +265,7 @@ class LoaderTests(TestCase): def num_nodes(): plan = set(loader.graph.forwards_plan(('migrations', '7_auto'))) - return len(plan - loader.applied_migrations) + return len(plan - loader.applied_migrations.keys()) # Empty database: use squashed migration loader.build_graph() @@ -339,7 +339,7 @@ class LoaderTests(TestCase): loader.build_graph() plan = set(loader.graph.forwards_plan(('app1', '4_auto'))) - plan = plan - loader.applied_migrations + plan = plan - loader.applied_migrations.keys() expected_plan = { ('app2', '1_squashed_2'), ('app1', '3_auto'), @@ -358,7 +358,7 @@ class LoaderTests(TestCase): def num_nodes(): plan = set(loader.graph.forwards_plan(('migrations', '7_auto'))) - return len(plan - loader.applied_migrations) + return len(plan - loader.applied_migrations.keys()) # Empty database: use squashed migration loader.build_graph() @@ -466,7 +466,7 @@ class LoaderTests(TestCase): # Load with nothing applied: both migrations squashed. loader.build_graph() plan = set(loader.graph.forwards_plan(('app1', '4_auto'))) - plan = plan - loader.applied_migrations + plan = plan - loader.applied_migrations.keys() expected_plan = { ('app1', '1_auto'), ('app2', '1_squashed_2'), @@ -480,7 +480,7 @@ class LoaderTests(TestCase): recorder.record_applied('app1', '2_auto') loader.build_graph() plan = set(loader.graph.forwards_plan(('app1', '4_auto'))) - plan = plan - loader.applied_migrations + plan = plan - loader.applied_migrations.keys() expected_plan = { ('app2', '1_squashed_2'), ('app1', '3_auto'), @@ -492,7 +492,7 @@ class LoaderTests(TestCase): recorder.record_applied('app2', '1_auto') loader.build_graph() plan = set(loader.graph.forwards_plan(('app1', '4_auto'))) - plan = plan - loader.applied_migrations + plan = plan - loader.applied_migrations.keys() expected_plan = { ('app2', '2_auto'), ('app1', '3_auto'), |