summaryrefslogtreecommitdiff
path: root/tests/get_object_or_404
diff options
context:
space:
mode:
authorHasan <hasan.r67@gmail.com>2016-01-04 12:20:08 +0330
committerTim Graham <timograham@gmail.com>2016-01-29 13:03:39 -0500
commit253adc2b8a52982139d40c4f55b3fd446e1cb8f3 (patch)
treec508d48636f5b37e97c8078737d398d7475ff8cc /tests/get_object_or_404
parent3d0dcd7f5af378d3ab6adb303b913e6c7b2e0ee5 (diff)
downloaddjango-253adc2b8a52982139d40c4f55b3fd446e1cb8f3.tar.gz
Refs #26022 -- Used context manager version of assertRaisesMessage in tests.
Diffstat (limited to 'tests/get_object_or_404')
-rw-r--r--tests/get_object_or_404/tests.py27
1 files changed, 9 insertions, 18 deletions
diff --git a/tests/get_object_or_404/tests.py b/tests/get_object_or_404/tests.py
index 55d1de7c2c..ac4b2d4738 100644
--- a/tests/get_object_or_404/tests.py
+++ b/tests/get_object_or_404/tests.py
@@ -81,27 +81,18 @@ class GetObjectOr404Tests(TestCase):
def test_bad_class(self):
# Given an argument klass that is not a Model, Manager, or Queryset
# raises a helpful ValueError message
- self.assertRaisesMessage(
- ValueError,
- "Object is of type 'str', but must be a Django Model, Manager, "
- "or QuerySet",
- get_object_or_404, str("Article"), title__icontains="Run"
- )
+ msg = "Object is of type 'str', but must be a Django Model, Manager, or QuerySet"
+ with self.assertRaisesMessage(ValueError, msg):
+ get_object_or_404(str("Article"), title__icontains="Run")
class CustomClass(object):
pass
- self.assertRaisesMessage(
- ValueError,
- "Object is of type 'CustomClass', but must be a Django Model, "
- "Manager, or QuerySet",
- get_object_or_404, CustomClass, title__icontains="Run"
- )
+ msg = "Object is of type 'CustomClass', but must be a Django Model, Manager, or QuerySet"
+ with self.assertRaisesMessage(ValueError, msg):
+ get_object_or_404(CustomClass, title__icontains="Run")
# Works for lists too
- self.assertRaisesMessage(
- ValueError,
- "Object is of type 'list', but must be a Django Model, Manager, "
- "or QuerySet",
- get_list_or_404, [Article], title__icontains="Run"
- )
+ msg = "Object is of type 'list', but must be a Django Model, Manager, or QuerySet"
+ with self.assertRaisesMessage(ValueError, msg):
+ get_list_or_404([Article], title__icontains="Run")