summaryrefslogtreecommitdiff
path: root/tests/model_inheritance_regress
diff options
context:
space:
mode:
authorHasan <hasan.r67@gmail.com>2016-01-17 14:56:39 +0330
committerTim Graham <timograham@gmail.com>2016-01-29 12:32:18 -0500
commit3d0dcd7f5af378d3ab6adb303b913e6c7b2e0ee5 (patch)
tree0d1074cc65a72096e44a4165611fddfc5b7ef7fb /tests/model_inheritance_regress
parent575706331bec4bf58ce36a9540c4c61fca49025b (diff)
downloaddjango-3d0dcd7f5af378d3ab6adb303b913e6c7b2e0ee5.tar.gz
Refs #26022 -- Used context manager version of assertRaises in tests.
Diffstat (limited to 'tests/model_inheritance_regress')
-rw-r--r--tests/model_inheritance_regress/tests.py22
1 files changed, 8 insertions, 14 deletions
diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py
index 7f6f872b42..f7044144ec 100644
--- a/tests/model_inheritance_regress/tests.py
+++ b/tests/model_inheritance_regress/tests.py
@@ -171,14 +171,10 @@ class ModelInheritanceTest(TestCase):
# the ItalianRestaurant.
Restaurant.objects.all().delete()
- self.assertRaises(
- Place.DoesNotExist,
- Place.objects.get,
- pk=ident)
- self.assertRaises(
- ItalianRestaurant.DoesNotExist,
- ItalianRestaurant.objects.get,
- pk=ident)
+ with self.assertRaises(Place.DoesNotExist):
+ Place.objects.get(pk=ident)
+ with self.assertRaises(ItalianRestaurant.DoesNotExist):
+ ItalianRestaurant.objects.get(pk=ident)
def test_issue_6755(self):
"""
@@ -241,14 +237,12 @@ class ModelInheritanceTest(TestCase):
self.assertEqual(c1.get_next_by_pub_date(), c2)
self.assertEqual(c2.get_next_by_pub_date(), c3)
- self.assertRaises(
- ArticleWithAuthor.DoesNotExist,
- c3.get_next_by_pub_date)
+ with self.assertRaises(ArticleWithAuthor.DoesNotExist):
+ c3.get_next_by_pub_date()
self.assertEqual(c3.get_previous_by_pub_date(), c2)
self.assertEqual(c2.get_previous_by_pub_date(), c1)
- self.assertRaises(
- ArticleWithAuthor.DoesNotExist,
- c1.get_previous_by_pub_date)
+ with self.assertRaises(ArticleWithAuthor.DoesNotExist):
+ c1.get_previous_by_pub_date()
def test_inherited_fields(self):
"""