Commit d60a8777 authored by Justin Bronn's avatar Justin Bronn
Browse files

Add `setUp` and `tearDown` methods to the geographic feed and sitemap tests to... 

Add `setUp` and `tearDown` methods to the geographic feed and sitemap tests to ensure `Site` exists for tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 12733104

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

+10 −0
Original line number Diff line number Diff line 
from xml.dom import minidom

from django.conf import settings

from django.contrib.sites.models import Site

from django.test import TestCase



from models import City
@@ -8,6 +10,14 @@ class GeoFeedTest(TestCase): 


    urls = 'django.contrib.gis.tests.geoapp.urls'



    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



    def tearDown(self):

        Site._meta.installed = self.old_Site_meta_installed



    def assertChildNodes(self, elem, expected):

        "Taken from regressiontests/syndication/tests.py."

        actual = set([n.nodeName for n in elem.childNodes])

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

+10 −0
Original line number Diff line number Diff line 
import cStringIO

from xml.dom import minidom

import zipfile

from django.conf import settings

from django.contrib.sites.models import Site

from django.test import TestCase



from models import City, Country
@@ -10,6 +12,14 @@ class GeoSitemapTest(TestCase): 


    urls = 'django.contrib.gis.tests.geoapp.urls'



    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



    def tearDown(self):

        Site._meta.installed = self.old_Site_meta_installed



    def assertChildNodes(self, elem, expected):

        "Taken from regressiontests/syndication/tests.py."

        actual = set([n.nodeName for n in elem.childNodes])