summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPreston Timmons <prestontimmons@gfa.org>2013-04-02 23:45:54 +0000
committerCarl Meyer <carl@oddbird.net>2013-04-02 20:12:35 -0600
commite3cfbaaca45bad6d1f064644c9bab7b2f3a38708 (patch)
tree6c01ccf47cf994af604cb0a0ede76cde0a8616d7
parent629d704d5fccc9b4b5e997b06f34a04b502953d1 (diff)
downloaddjango-e3cfbaaca45bad6d1f064644c9bab7b2f3a38708.tar.gz
Modified sitemaps to work with unittest2 discovery.
-rw-r--r--django/contrib/sitemaps/tests/__init__.py8
-rw-r--r--django/contrib/sitemaps/tests/test_flatpages.py (renamed from django/contrib/sitemaps/tests/flatpages.py)0
-rw-r--r--django/contrib/sitemaps/tests/test_generic.py (renamed from django/contrib/sitemaps/tests/generic.py)0
-rw-r--r--django/contrib/sitemaps/tests/test_http.py (renamed from django/contrib/sitemaps/tests/http.py)0
-rw-r--r--django/contrib/sitemaps/tests/test_https.py (renamed from django/contrib/sitemaps/tests/https.py)0
5 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/sitemaps/tests/__init__.py b/django/contrib/sitemaps/tests/__init__.py
index b9cf5f7a7f..fdbb9696d5 100644
--- a/django/contrib/sitemaps/tests/__init__.py
+++ b/django/contrib/sitemaps/tests/__init__.py
@@ -1,4 +1,4 @@
-from .flatpages import FlatpagesSitemapTests
-from .generic import GenericViewsSitemapTests
-from .http import HTTPSitemapTests
-from .https import HTTPSSitemapTests, HTTPSDetectionSitemapTests
+from .test_flatpages import FlatpagesSitemapTests
+from .test_generic import GenericViewsSitemapTests
+from .test_http import HTTPSitemapTests
+from .test_https import HTTPSSitemapTests, HTTPSDetectionSitemapTests
diff --git a/django/contrib/sitemaps/tests/flatpages.py b/django/contrib/sitemaps/tests/test_flatpages.py
index 930f24f22c..930f24f22c 100644
--- a/django/contrib/sitemaps/tests/flatpages.py
+++ b/django/contrib/sitemaps/tests/test_flatpages.py
diff --git a/django/contrib/sitemaps/tests/generic.py b/django/contrib/sitemaps/tests/test_generic.py
index 5b265736b3..5b265736b3 100644
--- a/django/contrib/sitemaps/tests/generic.py
+++ b/django/contrib/sitemaps/tests/test_generic.py
diff --git a/django/contrib/sitemaps/tests/http.py b/django/contrib/sitemaps/tests/test_http.py
index 1a91d970f3..1a91d970f3 100644
--- a/django/contrib/sitemaps/tests/http.py
+++ b/django/contrib/sitemaps/tests/test_http.py
diff --git a/django/contrib/sitemaps/tests/https.py b/django/contrib/sitemaps/tests/test_https.py
index baad02ac07..baad02ac07 100644
--- a/django/contrib/sitemaps/tests/https.py
+++ b/django/contrib/sitemaps/tests/test_https.py