Modified sitemaps to work with unittest2 discovery.

1 files changed, 0 insertions, 56 deletions

diff --git a/django/contrib/sitemaps/tests/https.py b/django/contrib/sitemaps/tests/https.py
deleted file mode 100644
index baad02ac07..0000000000
--- a/django/contrib/sitemaps/tests/https.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from __future__ import unicode_literals
-
-from datetime import date
-
-from django.test.utils import override_settings
-
-from .base import SitemapTestsBase
-
-class HTTPSSitemapTests(SitemapTestsBase):
-    protocol = 'https'
-    urls = 'django.contrib.sitemaps.tests.urls.https'
-
-    def test_secure_sitemap_index(self):
-        "A secure sitemap index can be rendered"
-        response = self.client.get('/secure/index.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<sitemap><loc>%s/secure/sitemap-simple.xml</loc></sitemap>
-</sitemapindex>
-""" % self.base_url
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    def test_secure_sitemap_section(self):
-        "A secure sitemap section can be rendered"
-        response = self.client.get('/secure/sitemap-simple.xml')
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>%s/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % (self.base_url, date.today())
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-
-@override_settings(SECURE_PROXY_SSL_HEADER=False)
-class HTTPSDetectionSitemapTests(SitemapTestsBase):
-    extra = {'wsgi.url_scheme': 'https'}
-
-    def test_sitemap_index_with_https_request(self):
-        "A sitemap index requested in HTTPS is rendered with HTTPS links"
-        response = self.client.get('/simple/index.xml', **self.extra)
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<sitemap><loc>%s/simple/sitemap-simple.xml</loc></sitemap>
-</sitemapindex>
-""" % self.base_url.replace('http://', 'https://')
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
-
-    def test_sitemap_section_with_https_request(self):
-        "A sitemap section requested in HTTPS is rendered with HTTPS links"
-        response = self.client.get('/simple/sitemap-simple.xml', **self.extra)
-        expected_content = """<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url><loc>%s/location/</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
-</urlset>
-""" % (self.base_url.replace('http://', 'https://'), date.today())
-        self.assertXMLEqual(response.content.decode('utf-8'), expected_content)