summaryrefslogtreecommitdiff
path: root/tests/urlpatterns_reverse
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-12-21 21:19:05 +0100
committerClaude Paroz <claude@2xlibre.net>2014-12-30 18:16:25 +0100
commit51890ce8898f821d28f2f6fb6071c936e9bd88f0 (patch)
tree6522c597d411086b0a5c2ec3dd7a1d9bc2feeafd /tests/urlpatterns_reverse
parent66f9a74b4514bd259976ce8ee3a4e78288358a5f (diff)
Applied ignore_warnings to Django tests
Diffstat (limited to 'tests/urlpatterns_reverse')
-rw-r--r--tests/urlpatterns_reverse/tests.py25
1 files changed, 11 insertions, 14 deletions
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index 18299fe733..bb732d2fec 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -6,7 +6,6 @@ from __future__ import unicode_literals
import sys
import unittest
-import warnings
from django.contrib.auth.models import User
from django.conf import settings
@@ -16,7 +15,7 @@ from django.core.urlresolvers import (reverse, reverse_lazy, resolve, get_callab
RegexURLPattern)
from django.http import HttpRequest, HttpResponseRedirect, HttpResponsePermanentRedirect
from django.shortcuts import redirect
-from django.test import TestCase, override_settings
+from django.test import TestCase, ignore_warnings, override_settings
from django.utils import six
from django.utils.deprecation import RemovedInDjango20Warning
@@ -177,16 +176,15 @@ class NoURLPatternsTests(TestCase):
@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls')
class URLPatternReverse(TestCase):
+ @ignore_warnings(category=RemovedInDjango20Warning)
def test_urlpattern_reverse(self):
- with warnings.catch_warnings():
- warnings.filterwarnings("ignore", category=RemovedInDjango20Warning)
- for name, expected, args, kwargs in test_data:
- try:
- got = reverse(name, args=args, kwargs=kwargs)
- except NoReverseMatch:
- self.assertEqual(expected, NoReverseMatch)
- else:
- self.assertEqual(got, expected)
+ for name, expected, args, kwargs in test_data:
+ try:
+ got = reverse(name, args=args, kwargs=kwargs)
+ except NoReverseMatch:
+ self.assertEqual(expected, NoReverseMatch)
+ else:
+ self.assertEqual(got, expected)
def test_reverse_none(self):
# Reversing None should raise an error, not return the last un-named view.
@@ -385,12 +383,11 @@ class ReverseShortcutTests(TestCase):
redirect("urlpatterns_reverse.nonimported_module.view")
self.assertNotIn("urlpatterns_reverse.nonimported_module", sys.modules)
+ @ignore_warnings(category=RemovedInDjango20Warning)
def test_reverse_by_path_nested(self):
# Views that are added to urlpatterns using include() should be
# reversible by doted path.
- with warnings.catch_warnings():
- warnings.filterwarnings("ignore", category=RemovedInDjango20Warning)
- self.assertEqual(reverse('urlpatterns_reverse.views.nested_view'), '/includes/nested_path/')
+ self.assertEqual(reverse('urlpatterns_reverse.views.nested_view'), '/includes/nested_path/')
def test_redirect_view_object(self):
from .views import absolute_kwargs_view