Ticket #7835: 7835.test_extra_apps.diff

django/django/test/testcases.py

@@ -8 +8 @@
 from django.core.management import call_command
 from django.core.urlresolvers import clear_url_caches
 from django.db import transaction
+from django.db.models.loading import load_app
 from django.http import QueryDict
 from django.test import _doctest as doctest
 from django.test.client import Client
@@ -173 +174 @@
     def _pre_setup(self):
         """Performs any pre-test setup. This includes:
 
+            * If the Test Case class has a 'installed_apps' member, replace the
+              INSTALLED_APPS with it.
+            * If the Test Case class has a 'extra_apps' member, append it to
+              INSTALLED_APPS.
             * Flushing the database.
             * If the Test Case class has a 'fixtures' member, installing the 
               named fixtures.
@@ -180 +185 @@
               ROOT_URLCONF with it.
             * Clearing the mail test outbox.
         """
+        if hasattr(self, 'installed_apps'):
+            self._old_installed_apps = settings.INSTALLED_APPS
+            settings.INSTALLED_APPS = list(self.installed_apps)
+        if hasattr(self, 'extra_apps'):
+            if hasattr(self, '_old_installed_apps'):
+                # extra_apps and installed_apps can coexist
+                settings.INSTALLED_APPS += list(self.extra_apps)
+            else:
+                self._old_installed_apps = settings.INSTALLED_APPS
+                settings.INSTALLED_APPS += list(self.extra_apps)
+        if hasattr(self, '_old_installed_apps'):
+            for app_label in settings.INSTALLED_APPS:
+                load_app(app_label)
+            # Create the new tables in db
+            call_command('syncdb', verbosity=0, interactive=False)
         call_command('flush', verbosity=0, interactive=False)
         if hasattr(self, 'fixtures'):
             # We have to use this slightly awkward syntax due to the fact
@@ -220 +240 @@
         """ Performs any post-test things. This includes:
 
             * Putting back the original ROOT_URLCONF if it was changed.
+            * Putting back the original INSTALLED_APPS if it was changed.
         """
         if hasattr(self, '_old_root_urlconf'):
             settings.ROOT_URLCONF = self._old_root_urlconf
@@ -224 +245 @@
         if hasattr(self, '_old_root_urlconf'):
             settings.ROOT_URLCONF = self._old_root_urlconf
             clear_url_caches()
+        if hasattr(self, '_old_installed_apps'):
+            settings.INSTALLED_APPS = self._old_installed_apps
+            #TODO: test apps should be unloaded from the app cache, and the extra tables destroyed.
 
     def assertRedirects(self, response, expected_url, status_code=302,
                         target_status_code=200, host=None):