Commit 7eea9bf3 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Normalized Model._meta.installed. 

Used the information from the app cache instead of creating a duplicate
based on INSTALLED_APPS.

Model._meta.installed is no longer writable. It was a rather sketchy way
to alter private internals anyway.
parent 0242c56f

django/contrib/contenttypes/tests.py

+8 −7
Original line number Diff line number Diff line
@@ -52,12 +52,13 @@ class FooWithBrokenAbsoluteUrl(FooWithoutUrl): 




class ContentTypesTests(TestCase):



    def setUp(self):

        self.old_Site_meta_installed = Site._meta.installed

        self._old_installed = Site._meta.app_config.installed

        ContentType.objects.clear_cache()



    def tearDown(self):

        Site._meta.installed = self.old_Site_meta_installed

        Site._meta.app_config.installed = self._old_installed

        ContentType.objects.clear_cache()



    def test_lookup_cache(self):
@@ -222,12 +223,12 @@ class ContentTypesTests(TestCase): 
        user_ct = ContentType.objects.get_for_model(FooWithUrl)

        obj = FooWithUrl.objects.create(name="john")



        if Site._meta.installed:

        Site._meta.app_config.installed = True

        response = shortcut(request, user_ct.id, obj.id)

        self.assertEqual("http://%s/users/john/" % get_current_site(request).domain,

                         response._headers.get("location")[1])



        Site._meta.installed = False

        Site._meta.app_config.installed = False

        response = shortcut(request, user_ct.id, obj.id)

        self.assertEqual("http://Example.com/users/john/",

                         response._headers.get("location")[1])

django/contrib/gis/tests/geoapp/test_feeds.py

+3 −3
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ class GeoFeedTest(TestCase): 


    def setUp(self):

        Site(id=settings.SITE_ID, domain="example.com", name="example.com").save()

        self.old_Site_meta_installed = Site._meta.installed

        Site._meta.installed = True

        self._old_installed = Site._meta.app_config.installed

        Site._meta.app_config.installed = True



    def tearDown(self):

        Site._meta.installed = self.old_Site_meta_installed

        Site._meta.app_config.installed = self._old_installed



    def assertChildNodes(self, elem, expected):

        "Taken from syndication/tests.py."

django/contrib/gis/tests/geoapp/test_sitemaps.py

+3 −3
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ class GeoSitemapTest(IgnoreDeprecationWarningsMixin, TestCase): 
    def setUp(self):

        super(GeoSitemapTest, self).setUp()

        Site(id=settings.SITE_ID, domain="example.com", name="example.com").save()

        self.old_Site_meta_installed = Site._meta.installed

        Site._meta.installed = True

        self._old_installed = Site._meta.app_config.installed

        Site._meta.app_config.installed = True



    def tearDown(self):

        Site._meta.installed = self.old_Site_meta_installed

        Site._meta.app_config.installed = self._old_installed

        super(GeoSitemapTest, self).tearDown()



    def assertChildNodes(self, elem, expected):

django/contrib/sitemaps/tests/base.py

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ class SitemapTestsBase(TestCase): 


    def setUp(self):

        self.base_url = '%s://%s' % (self.protocol, self.domain)

        self.old_Site_meta_installed = Site._meta.installed

        self._old_installed = Site._meta.app_config.installed

        cache.clear()

        # Create an object for sitemap content.

        TestModel.objects.create(name='Test Object')



    def tearDown(self):

        Site._meta.installed = self.old_Site_meta_installed
 
        Site._meta.app_config.installed = self._old_installed

django/contrib/sitemaps/tests/test_http.py

+5 −3
Original line number Diff line number Diff line
@@ -107,8 +107,9 @@ class HTTPSitemapTests(SitemapTestsBase): 


    def test_requestsite_sitemap(self):

        # Make sure hitting the flatpages sitemap without the sites framework

        # installed doesn't raise an exception

        Site._meta.installed = False

        # installed doesn't raise an exception.

        # Reset by SitemapTestsBase.tearDown().

        Site._meta.app_config.installed = False

        response = self.client.get('/simple/sitemap.xml')

        expected_content = """<?xml version="1.0" encoding="UTF-8"?>

<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
@@ -133,7 +134,8 @@ class HTTPSitemapTests(SitemapTestsBase): 
        Sitemap.get_urls if Site objects exists, but the sites framework is not

        actually installed.

        """

        Site._meta.installed = False

        # Reset by SitemapTestsBase.tearDown().

        Site._meta.app_config.installed = False

        self.assertRaises(ImproperlyConfigured, Sitemap().get_urls)



    def test_sitemap_item(self):