Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.5.x] Updated deprecated test assertions

  • Loading branch information...
commit beef02eeaaf0f6a70a56e1d81e3ec39659e2ad1e 1 parent b6119a6
@claudep claudep authored
View
4 django/contrib/auth/tests/management.py
@@ -186,7 +186,7 @@ def test_duplicated_permissions(self):
# check duplicated default permission
models.Permission._meta.permissions = [
('change_permission', 'Can edit permission (duplicate)')]
- self.assertRaisesRegexp(CommandError,
+ six.assertRaisesRegex(self, CommandError,
"The permission codename 'change_permission' clashes with a "
"builtin permission for model 'auth.Permission'.",
create_permissions, models, [], verbosity=0)
@@ -197,7 +197,7 @@ def test_duplicated_permissions(self):
('other_one', 'Some other permission'),
('my_custom_permission', 'Some permission with duplicate permission code'),
]
- self.assertRaisesRegexp(CommandError,
+ six.assertRaisesRegex(self, CommandError,
"The permission codename 'my_custom_permission' is duplicated for model "
"'auth.Permission'.",
create_permissions, models, [], verbosity=0)
View
6 tests/modeltests/basic/tests.py
@@ -140,21 +140,21 @@ def test_lookup(self):
# Django raises an Article.MultipleObjectsReturned exception if the
# lookup matches more than one object
- self.assertRaisesRegexp(
+ six.assertRaisesRegex(self,
MultipleObjectsReturned,
"get\(\) returned more than one Article -- it returned 2!",
Article.objects.get,
headline__startswith='Area',
)
- self.assertRaisesRegexp(
+ six.assertRaisesRegex(self,
MultipleObjectsReturned,
"get\(\) returned more than one Article -- it returned 2!",
Article.objects.get,
pub_date__year=2005,
)
- self.assertRaisesRegexp(
+ six.assertRaisesRegex(self,
MultipleObjectsReturned,
"get\(\) returned more than one Article -- it returned 2!",
Article.objects.get,
View
2  tests/modeltests/str/tests.py
@@ -28,7 +28,7 @@ def test_broken(self):
headline='Girl wins €12.500 in lottery',
pub_date=datetime.datetime(2005, 7, 28)
)
- self.assertRaisesRegexp(RuntimeError, "Did you apply "
+ six.assertRaisesRegex(self, RuntimeError, "Did you apply "
"@python_2_unicode_compatible without defining __str__\?", str, a)
def test_international(self):
View
2  tests/regressiontests/backends/tests.py
@@ -42,7 +42,7 @@ def test_quote_name(self):
# Check that '%' chars are escaped for query execution.
name = '"SOME%NAME"'
quoted_name = connection.ops.quote_name(name)
- self.assertEquals(quoted_name % (), name)
+ self.assertEqual(quoted_name % (), name)
@unittest.skipUnless(connection.vendor == 'oracle',
"No need to check Oracle cursor semantics")
View
4 tests/regressiontests/templates/tests.py
@@ -370,13 +370,13 @@ def test_url_explicit_exception_for_old_syntax_at_run_time(self):
# Regression test for #19280
t = Template('{% url path.to.view %}') # not quoted = old syntax
c = Context()
- with self.assertRaisesRegexp(urlresolvers.NoReverseMatch,
+ with six.assertRaisesRegex(self, urlresolvers.NoReverseMatch,
"The syntax changed in Django 1.5, see the docs."):
t.render(c)
def test_url_explicit_exception_for_old_syntax_at_compile_time(self):
# Regression test for #19392
- with self.assertRaisesRegexp(template.TemplateSyntaxError,
+ with six.assertRaisesRegex(self, template.TemplateSyntaxError,
"The syntax of 'url' changed in Django 1.5, see the docs."):
t = Template('{% url my-view %}') # not a variable = old syntax
Please sign in to comment.
Something went wrong with that request. Please try again.