From 1ac4c7d415750ddc648cbf888bc2fbcde933f799 Mon Sep 17 00:00:00 2001 From: Marten Kenbeek Date: Sun, 24 May 2015 21:17:39 +0200 Subject: [1.8.x] Fixed #24848 -- Fixed ValueError for faulty migrations module. Added apps to unmigrated apps if the migrations module is a file or a folder missing __init__.py. Thanks to Ernest0x for the bug report. Backport of d73176a84273c06fa11075c65293ec28497a8423 from master --- tests/migrations/test_loader.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/migrations/test_loader.py b/tests/migrations/test_loader.py index b189da0721..070ca2a86c 100644 --- a/tests/migrations/test_loader.py +++ b/tests/migrations/test_loader.py @@ -164,12 +164,20 @@ class LoaderTests(TestCase): def test_load_module_file(self): with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.file"}): - MigrationLoader(connection) + loader = MigrationLoader(connection) + self.assertIn( + "migrations", loader.unmigrated_apps, + "App with migrations module file not in unmigrated apps." + ) @skipIf(six.PY2, "PY2 doesn't load empty dirs.") def test_load_empty_dir(self): with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.namespace"}): - MigrationLoader(connection) + loader = MigrationLoader(connection) + self.assertIn( + "migrations", loader.unmigrated_apps, + "App missing __init__.py in migrations module not in unmigrated apps." + ) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"}) def test_loading_squashed(self): -- cgit v1.3