summaryrefslogtreecommitdiff
path: root/tests/migrations/test_loader.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-08-29 14:54:08 +0200
committerClaude Paroz <claude@2xlibre.net>2014-08-30 12:37:10 +0200
commit66757fee7e921ad4c35e0b3f80c25e026100b31c (patch)
tree0b6a6e10a1d800532d114ab4b5b4a2d6f7d73abd /tests/migrations/test_loader.py
parent05a8cef4288e2a85dbaff12bc2683a75c9998618 (diff)
Fixed #23384 -- Allowed overriding part of a dictionary-type setting
This change is needed for upcoming changes where settings might be grouped in a parent dictionary. Thanks Tim Graham for the review.
Diffstat (limited to 'tests/migrations/test_loader.py')
-rw-r--r--tests/migrations/test_loader.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/migrations/test_loader.py b/tests/migrations/test_loader.py
index 68d05d296f..9f7ce9a8e7 100644
--- a/tests/migrations/test_loader.py
+++ b/tests/migrations/test_loader.py
@@ -81,7 +81,10 @@ class LoaderTests(TestCase):
# Ensure we've included unmigrated apps in there too
self.assertIn("basic", project_state.real_apps)
- @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_unmigdep"})
+ @override_settings(MIGRATION_MODULES={
+ "_clear_defaults": True,
+ "migrations": "migrations.test_migrations_unmigdep"
+ })
def test_load_unmigrated_dependency(self):
"""
Makes sure the loader can load migrations with a dependency on an unmigrated app.