Commit c0cc8f69 authored by Tim Graham's avatar Tim Graham
Browse files

Refactored tests that rely on an ImportError for Python 3.5 compatibility 

A change in Python test discovery [1] causes the old packages that raised
an error to be discovered; now we use a common directory that's
ignored during discovery. Refs #23763.

[1] http://bugs.python.org/issue7559
parent 65e005f8

tests/apps/failing_app/__init__.py

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
raise ImportError("Oops")

tests/apps/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ class AppsTests(TestCase): 
        App discovery should preserve stack traces. Regression test for #22920.

        """

        with six.assertRaisesRegex(self, ImportError, "Oops"):

            with self.settings(INSTALLED_APPS=['apps.failing_app']):

            with self.settings(INSTALLED_APPS=['import_error_package']):

                pass



    def test_models_py(self):

tests/import_error_package/__init__.py

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# A package that raises an ImportError that can be shared among test apps and

# excluded from test discovery.

raise ImportError("Oops")

tests/migrations/faulty_migrations/import_error/__init__.py

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
import fake_python_module  # NOQA

tests/migrations/test_loader.py

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ class LoaderTests(TestCase): 
            migration_loader.get_migration_by_prefix("migrations", "blarg")



    def test_load_import_error(self):

        with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.import_error"}):

        with override_settings(MIGRATION_MODULES={"migrations": "import_error_package"}):

            with self.assertRaises(ImportError):

                MigrationLoader(connection)