summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-10 08:41:45 -0500
committerTim Graham <timograham@gmail.com>2015-02-11 10:19:22 -0500
commit00da46091a0b35d4822b30e29334de4f4869901e (patch)
treefe071079f7a68c84958ba572e29d03f45091dfb3
parentb3cd9e0d0732e1fd7d2afd5825dda5b3857927da (diff)
Moved contrib.redirects tests out of contrib.
-rw-r--r--tests/redirects_tests/__init__.py0
-rw-r--r--tests/redirects_tests/tests.py (renamed from django/contrib/redirects/tests.py)7
-rwxr-xr-xtests/runtests.py2
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/redirects_tests/__init__.py b/tests/redirects_tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/redirects_tests/__init__.py
diff --git a/django/contrib/redirects/tests.py b/tests/redirects_tests/tests.py
index 3bed0e02e5..faa8cfe023 100644
--- a/django/contrib/redirects/tests.py
+++ b/tests/redirects_tests/tests.py
@@ -1,13 +1,12 @@
from django import http
from django.conf import settings
+from django.contrib.redirects.middleware import RedirectFallbackMiddleware
+from django.contrib.redirects.models import Redirect
from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase, modify_settings, override_settings
from django.utils import six
-from .middleware import RedirectFallbackMiddleware
-from .models import Redirect
-
@modify_settings(MIDDLEWARE_CLASSES={'append':
'django.contrib.redirects.middleware.RedirectFallbackMiddleware'})
@@ -65,7 +64,7 @@ class OverriddenRedirectFallbackMiddleware(RedirectFallbackMiddleware):
@modify_settings(MIDDLEWARE_CLASSES={'append':
- 'django.contrib.redirects.tests.OverriddenRedirectFallbackMiddleware'})
+ 'redirects_tests.tests.OverriddenRedirectFallbackMiddleware'})
@override_settings(SITE_ID=1)
class OverriddenRedirectMiddlewareTests(TestCase):
diff --git a/tests/runtests.py b/tests/runtests.py
index 1bb3c5699e..e8741ea56c 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -66,6 +66,7 @@ ALWAYS_MIDDLEWARE_CLASSES = [
# before its application was loaded."
CONTRIB_TESTS_TO_APPS = {
'flatpages_tests': 'django.contrib.flatpages',
+ 'redirects_tests': 'django.contrib.redirects',
}
@@ -149,6 +150,7 @@ def setup(verbosity, test_labels):
'auth': 'django.contrib.auth.tests.migrations',
'contenttypes': 'django.contrib.contenttypes.tests.migrations',
'flatpages_tests': 'django.contrib.flatpages.migrations',
+ 'redirects_tests': 'django.contrib.redirects.migrations',
}
if verbosity > 0: