mirror of
https://github.com/django/django.git
synced 2025-08-03 18:38:50 +00:00
[py3k] Silence many warnings while running the tests.
This commit is contained in:
parent
4321ee25c5
commit
292322f977
29 changed files with 213 additions and 196 deletions
|
@ -4,6 +4,7 @@ Unit tests for reverse URL lookups.
|
|||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
|
||||
from django.core.urlresolvers import (reverse, resolve, get_callable,
|
||||
get_resolver, NoReverseMatch, Resolver404, ResolverMatch, RegexURLResolver,
|
||||
|
@ -11,10 +12,9 @@ from django.core.urlresolvers import (reverse, resolve, get_callable,
|
|||
from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
|
||||
from django.shortcuts import redirect
|
||||
from django.test import TestCase
|
||||
from django.utils import unittest
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils import unittest, six
|
||||
|
||||
from . import urlconf_outer, urlconf_inner, middleware, views
|
||||
from . import urlconf_outer, middleware, views
|
||||
|
||||
|
||||
resolve_test_data = (
|
||||
|
@ -535,7 +535,7 @@ class ViewLoadingTests(TestCase):
|
|||
def test_view_loading(self):
|
||||
# A missing view (identified by an AttributeError) should raise
|
||||
# ViewDoesNotExist, ...
|
||||
self.assertRaisesRegexp(ViewDoesNotExist, ".*View does not exist in.*",
|
||||
six.assertRaisesRegex(self, ViewDoesNotExist, ".*View does not exist in.*",
|
||||
get_callable,
|
||||
'regressiontests.urlpatterns_reverse.views.i_should_not_exist')
|
||||
# ... but if the AttributeError is caused by something else don't
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue