Commit 23ecf3cf authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Modified the sitemaps tests to remove an assumption about the... 

[1.2.X] Modified the sitemaps tests to remove an assumption about the environment in which the tests are run. Thanks to Gabriel Hurley for the report and patch.

Backport of r14184 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9b077ee4

django/contrib/sitemaps/tests/basic.py

+35 −25
Original line number Diff line number Diff line 
from datetime import date

from django.conf import settings

from django.contrib.auth.models import User

from django.contrib.flatpages.models import FlatPage

from django.contrib.sitemaps import Sitemap

from django.contrib.sites.models import Site

from django.core.exceptions import ImproperlyConfigured
@@ -52,15 +51,27 @@ class SitemapTests(TestCase): 
        "A minimal generic sitemap can be rendered"

        # Retrieve the sitemap.

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



        expected = ''

        for username in User.objects.values_list("username", flat=True):

            expected += "<url><loc>http://example.com/users/%s/</loc></url>" %username

        # Check for all the important bits:

        self.assertEquals(response.content, """<?xml version="1.0" encoding="UTF-8"?>

<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">

<url><loc>http://example.com/users/testuser/</loc></url>

%s

</urlset>

""")

""" %expected)



    if "django.contrib.flatpages" in settings.INSTALLED_APPS:

        def test_flatpage_sitemap(self):

            "Basic FlatPage sitemap test"



            # Import FlatPage inside the test so that when django.contrib.flatpages

            # is not installed we don't get problems trying to delete Site

            # objects (FlatPage has an M2M to Site, Site.delete() tries to

            # delete related objects, but the M2M table doesn't exist.

            from django.contrib.flatpages.models import FlatPage



            public = FlatPage.objects.create(

                url=u'/public/',

                title=u'Public Page',
@@ -85,7 +96,6 @@ class SitemapTests(TestCase): 
        # Make sure hitting the flatpages sitemap without the sites framework

        # installed doesn't raise an exception

        Site._meta.installed = False

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

        # Retrieve the sitemap.

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

        # Check for all the important bits: