Ticket #7835: 7835.test_extra_apps.2.diff

django/django/contrib/comments/tests/__init__.py

@@ -4 +4 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.test import TestCase
-from regressiontests.comment_tests.models import Article, Author
+from django.contrib.comments.tests.test_comments.models import Article, Author
 
 # Shortcut
 CT = ContentType.objects.get_for_model
@@ -13 +13 @@
 class CommentTestCase(TestCase):
     fixtures = ["comment_tests"]
     urls = 'django.contrib.comments.urls'
+    installed_apps = (
+            'django.contrib.sessions',
+            'django.contrib.sites',
+            'django.contrib.admin',
+            'django.contrib.auth',
+            'django.contrib.comments',
+            'django.contrib.contenttypes',
+            'django.contrib.comments.tests.test_comments'
+        )
 
     def createSomeComments(self):
         # Two anonymous comments on two different objects
@@ -80 +89 @@
         d.update(f.initial)
         return d
 
-from regressiontests.comment_tests.tests.app_api_tests import *
-from regressiontests.comment_tests.tests.model_tests import *
-from regressiontests.comment_tests.tests.comment_form_tests import *
-from regressiontests.comment_tests.tests.templatetag_tests import *
-from regressiontests.comment_tests.tests.comment_view_tests import *
-from regressiontests.comment_tests.tests.moderation_view_tests import *
+from django.contrib.comments.tests.app_api_tests import *
+from django.contrib.comments.tests.model_tests import *
+from django.contrib.comments.tests.comment_form_tests import *
+from django.contrib.comments.tests.templatetag_tests import *
+from django.contrib.comments.tests.comment_view_tests import *
+from django.contrib.comments.tests.moderation_view_tests import *

django/django/contrib/comments/tests/app_api_tests.py

@@ -2 +2 @@
 from django.contrib import comments
 from django.contrib.comments.models import Comment
 from django.contrib.comments.forms import CommentForm
-from regressiontests.comment_tests.tests import CommentTestCase
+from django.contrib.comments.tests import CommentTestCase
 
 class CommentAppAPITests(CommentTestCase):
     """Tests for the "comment app" API"""

django/django/contrib/comments/tests/comment_form_tests.py

@@ -2 +2 @@
 from django.conf import settings
 from django.contrib.comments.models import Comment
 from django.contrib.comments.forms import CommentForm
-from regressiontests.comment_tests.models import Article
-from regressiontests.comment_tests.tests import CommentTestCase
+from django.contrib.comments.tests.test_comments.models import Article
+from django.contrib.comments.tests import CommentTestCase
 
 class CommentFormTests(CommentTestCase):
 

django/django/contrib/comments/tests/comment_view_tests.py

@@ -2 +2 @@
 from django.contrib.auth.models import User
 from django.contrib.comments import signals
 from django.contrib.comments.models import Comment
-from regressiontests.comment_tests.models import Article
-from regressiontests.comment_tests.tests import CommentTestCase
+from django.contrib.comments.tests.test_comments.models import Article
+from django.contrib.comments.tests import CommentTestCase
 
 class CommentViewTests(CommentTestCase):
 

django/django/contrib/comments/tests/model_tests.py

@@ -1 +1 @@
 from django.contrib.comments.models import Comment
-from regressiontests.comment_tests.models import Author, Article
-from regressiontests.comment_tests.tests import CommentTestCase
+from django.contrib.comments.tests.test_comments.models import Author, Article
+from django.contrib.comments.tests import CommentTestCase
 
 class CommentModelTests(CommentTestCase):
 

django/django/contrib/comments/tests/moderation_view_tests.py

@@ -1 +1 @@
 from django.contrib.comments.models import Comment, CommentFlag
 from django.contrib.auth.models import User, Permission
 from django.contrib.contenttypes.models import ContentType
-from regressiontests.comment_tests.tests import CommentTestCase
+from django.contrib.comments.tests import CommentTestCase
 from django.contrib.comments import signals
 
 class FlagViewTests(CommentTestCase):

django/django/contrib/comments/tests/templatetag_tests.py

@@ -1 +1 @@
 from django.contrib.comments.forms import CommentForm
 from django.contrib.comments.models import Comment
 from django.template import Template, Context
-from regressiontests.comment_tests.models import Article, Author
-from regressiontests.comment_tests.tests import CommentTestCase
+from django.contrib.comments.tests.test_comments.models import Article, Author
+from django.contrib.comments.tests import CommentTestCase
 
 class CommentTemplateTagTests(CommentTestCase):
 
@@ -16 +16 @@
         self.assertEqual(out, "/post/")
 
     def testGetCommentForm(self, tag=None):
-        t = "{% load comments %}" + (tag or "{% get_comment_form for comment_tests.article a.id as form %}")
+        t = "{% load comments %}" + (tag or "{% get_comment_form for test_comments.article a.id as form %}")
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
         self.assertEqual(out, "")
         self.assert_(isinstance(ctx["form"], CommentForm))
@@ -22 +22 @@
         self.assert_(isinstance(ctx["form"], CommentForm))
 
     def testGetCommentFormFromLiteral(self):
-        self.testGetCommentForm("{% get_comment_form for comment_tests.article 1 as form %}")
+        self.testGetCommentForm("{% get_comment_form for test_comments.article 1 as form %}")
 
     def testGetCommentFormFromObject(self):
         self.testGetCommentForm("{% get_comment_form for a as form %}")
@@ -28 +28 @@
         self.testGetCommentForm("{% get_comment_form for a as form %}")
 
     def testRenderCommentForm(self, tag=None):
-        t = "{% load comments %}" + (tag or "{% render_comment_form for comment_tests.article a.id %}")
+        t = "{% load comments %}" + (tag or "{% render_comment_form for test_comments.article a.id %}")
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
         self.assert_(out.strip().startswith("<form action="))
         self.assert_(out.strip().endswith("</form>"))
@@ -34 +34 @@
         self.assert_(out.strip().endswith("</form>"))
 
     def testRenderCommentFormFromLiteral(self):
-        self.testRenderCommentForm("{% render_comment_form for comment_tests.article 1 %}")
+        self.testRenderCommentForm("{% render_comment_form for test_comments.article 1 %}")
 
     def testRenderCommentFormFromObject(self):
         self.testRenderCommentForm("{% render_comment_form for a %}")
@@ -41 +41 @@
 
     def testGetCommentCount(self, tag=None):
         self.createSomeComments()
-        t = "{% load comments %}" + (tag or "{% get_comment_count for comment_tests.article a.id as cc %}") + "{{ cc }}"
+        t = "{% load comments %}" + (tag or "{% get_comment_count for test_comments.article a.id as cc %}") + "{{ cc }}"
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
         self.assertEqual(out, "2")
 
@@ -46 +46 @@
         self.assertEqual(out, "2")
 
     def testGetCommentCountFromLiteral(self):
-        self.testGetCommentCount("{% get_comment_count for comment_tests.article 1 as cc %}")
+        self.testGetCommentCount("{% get_comment_count for test_comments.article 1 as cc %}")
 
     def testGetCommentCountFromObject(self):
         self.testGetCommentCount("{% get_comment_count for a as cc %}")
@@ -53 +53 @@
 
     def testGetCommentList(self, tag=None):
         c1, c2, c3, c4 = self.createSomeComments()
-        t = "{% load comments %}" + (tag or "{% get_comment_list for comment_tests.author a.id as cl %}")
+        t = "{% load comments %}" + (tag or "{% get_comment_list for test_comments.author a.id as cl %}")
         ctx, out = self.render(t, a=Author.objects.get(pk=1))
         self.assertEqual(out, "")
         self.assertEqual(list(ctx["cl"]), [c2])
@@ -59 +59 @@
         self.assertEqual(list(ctx["cl"]), [c2])
 
     def testGetCommentListFromLiteral(self):
-        self.testGetCommentList("{% get_comment_list for comment_tests.author 1 as cl %}")
+        self.testGetCommentList("{% get_comment_list for test_comments.author 1 as cl %}")
 
     def testGetCommentListFromObject(self):
         self.testGetCommentList("{% get_comment_list for a as cl %}")

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.
+            * Create tables and load models for test apps.
             * Flushing the database.
             * If the Test Case class has a 'fixtures' member, installing the 
               named fixtures.
@@ -180 +186 @@
               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 +241 @@
         """ 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.
+            * Unload models and destroy tables for test apps.
         """
         if hasattr(self, '_old_root_urlconf'):
             settings.ROOT_URLCONF = self._old_root_urlconf
@@ -224 +247 @@
         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):