mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[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.

Browse Source 
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
This commit is contained in:
Russell Keith-Magee 2010-10-12 07:27:49 +00:00
parent 9b077ee4b6
commit 23ecf3cf6c
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/contrib/sitemaps/tests/basic.py
View File

@ -1,7 +1,6 @@
from datetime import date from datetime import date
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.flatpages.models import FlatPage
from django.contrib.sitemaps import Sitemap from django.contrib.sitemaps import Sitemap
from django.contrib.sites.models import Site from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
@ -52,15 +51,27 @@ class SitemapTests(TestCase):
"A minimal generic sitemap can be rendered" "A minimal generic sitemap can be rendered"
# Retrieve the sitemap. # Retrieve the sitemap.
response = self.client.get('/generic/sitemap.xml') 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: # Check for all the important bits:
self.assertEquals(response.content, """<?xml version="1.0" encoding="UTF-8"?> self.assertEquals(response.content, """<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url><loc>http://example.com/users/testuser/</loc></url> %s
</urlset> </urlset>
""") """ %expected)
if "django.contrib.flatpages" in settings.INSTALLED_APPS:
def test_flatpage_sitemap(self): def test_flatpage_sitemap(self):
"Basic FlatPage sitemap test" "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( public = FlatPage.objects.create(
url=u'/public/', url=u'/public/',
title=u'Public Page', title=u'Public Page',
@ -85,7 +96,6 @@ class SitemapTests(TestCase):
# Make sure hitting the flatpages sitemap without the sites framework # Make sure hitting the flatpages sitemap without the sites framework
# installed doesn't raise an exception # installed doesn't raise an exception
Site._meta.installed = False Site._meta.installed = False
response = self.client.get('/flatpages/sitemap.xml')
# Retrieve the sitemap. # Retrieve the sitemap.
response = self.client.get('/simple/sitemap.xml') response = self.client.get('/simple/sitemap.xml')
# Check for all the important bits: # Check for all the important bits: