Fixed #21977 -- Deprecated SimpleTestCase.urls

1 files changed, 11 insertions, 10 deletions

diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index a57b7e2a17..d2c4079fda 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import unittest
 
 from django.contrib.auth.models import User
+from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
 from django.core.urlresolvers import (reverse, reverse_lazy, resolve, get_callable,
     get_resolver, NoReverseMatch, Resolver404, ResolverMatch, RegexURLResolver,
@@ -152,14 +153,14 @@ test_data = (
 )
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.no_urls')
 class NoURLPatternsTests(TestCase):
-    urls = 'urlpatterns_reverse.no_urls'
 
     def test_no_urls_exception(self):
         """
         RegexURLResolver should raise an exception when no urlpatterns exist.
         """
-        resolver = RegexURLResolver(r'^$', self.urls)
+        resolver = RegexURLResolver(r'^$', settings.ROOT_URLCONF)
 
         self.assertRaisesMessage(ImproperlyConfigured,
             "The included urlconf 'urlpatterns_reverse.no_urls' does not "
@@ -168,8 +169,8 @@ class NoURLPatternsTests(TestCase):
             getattr, resolver, 'url_patterns')
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls')
 class URLPatternReverse(TestCase):
-    urls = 'urlpatterns_reverse.urls'
 
     def test_urlpattern_reverse(self):
         for name, expected, args, kwargs in test_data:
@@ -290,8 +291,8 @@ class ResolverTests(unittest.TestCase):
                             self.assertEqual(t.name, e['name'], 'Wrong URL name.  Expected "%s", got "%s".' % (e['name'], t.name))
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.reverse_lazy_urls')
 class ReverseLazyTest(TestCase):
-    urls = 'urlpatterns_reverse.reverse_lazy_urls'
 
     def test_redirect_with_lazy_reverse(self):
         response = self.client.get('/redirect/')
@@ -324,8 +325,8 @@ LOGIN_URL = reverse_lazy('login')""")
         self.assertNoOutput(err)
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls')
 class ReverseShortcutTests(TestCase):
-    urls = 'urlpatterns_reverse.urls'
 
     def test_redirect_to_object(self):
         # We don't really need a model; just something with a get_absolute_url
@@ -363,8 +364,8 @@ class ReverseShortcutTests(TestCase):
         self.assertRaises(NoReverseMatch, redirect, absolute_kwargs_view, wrong_argument=None)
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.namespace_urls')
 class NamespaceTests(TestCase):
-    urls = 'urlpatterns_reverse.namespace_urls'
 
     def test_ambiguous_object(self):
         "Names deployed via dynamic URL objects that require namespaces can't be resolved"
@@ -600,8 +601,8 @@ class ErrorHandlerResolutionTests(TestCase):
         self.assertEqual(self.callable_resolver.resolve500(), handler)
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls_without_full_import')
 class DefaultErrorHandlerTests(TestCase):
-    urls = 'urlpatterns_reverse.urls_without_full_import'
 
     def test_default_handler(self):
         "If the urls.py doesn't specify handlers, the defaults are used"
@@ -617,16 +618,16 @@ class DefaultErrorHandlerTests(TestCase):
             self.fail("Shouldn't get an AttributeError due to undefined 500 handler")
 
 
+@override_settings(ROOT_URLCONF=None)
 class NoRootUrlConfTests(TestCase):
     """Tests for handler404 and handler500 if urlconf is None"""
-    urls = None
 
     def test_no_handler_exception(self):
         self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/')
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.namespace_urls')
 class ResolverMatchTests(TestCase):
-    urls = 'urlpatterns_reverse.namespace_urls'
 
     def test_urlpattern_resolve(self):
         for path, name, app_name, namespace, func, args, kwargs in resolve_test_data:
@@ -661,8 +662,8 @@ class ResolverMatchTests(TestCase):
         self.assertIsNone(request.resolver_match)
 
 
+@override_settings(ROOT_URLCONF='urlpatterns_reverse.erroneous_urls')
 class ErroneousViewTests(TestCase):
-    urls = 'urlpatterns_reverse.erroneous_urls'
 
     def test_erroneous_resolve(self):
         self.assertRaises(ImportError, self.client.get, '/erroneous_inner/')