test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #17640 -- Avoided a DeprecationWarning in the test suite. Thanks zsiciarz and claudep. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2012-02-10 11:31:47 +00:00
parent ad8022f89a
commit 8be356ea99
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/regressiontests/test_utils/tests.py
View File

@ -136,24 +136,17 @@ class AssertTemplateUsedContextManagerTests(TestCase):
pass pass
def test_error_message(self): def test_error_message(self):
try: with self.assertRaisesRegexp(AssertionError, r'^template_used/base\.html'):
with self.assertTemplateUsed('template_used/base.html'): with self.assertTemplateUsed('template_used/base.html'):
pass pass
except AssertionError, e:
self.assertTrue('template_used/base.html' in e.message)
try: with self.assertRaisesRegexp(AssertionError, r'^template_used/base\.html'):
with self.assertTemplateUsed(template_name='template_used/base.html'): with self.assertTemplateUsed(template_name='template_used/base.html'):
pass pass
except AssertionError, e:
self.assertTrue('template_used/base.html' in e.message)
try: with self.assertRaisesRegexp(AssertionError, r'^template_used/base\.html.*template_used/alternative\.html$'):
with self.assertTemplateUsed('template_used/base.html'): with self.assertTemplateUsed('template_used/base.html'):
render_to_string('template_used/alternative.html') render_to_string('template_used/alternative.html')
except AssertionError, e:
self.assertTrue('template_used/base.html' in e.message, e.message)
self.assertTrue('template_used/alternative.html' in e.message, e.message)
def test_failure(self): def test_failure(self):
with self.assertRaises(TypeError): with self.assertRaises(TypeError):