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

Used assertRaisesMessage in managers_regress tests.

This commit is contained in:
Tim Graham 2015-07-02 14:23:28 -04:00
parent 61f3e22e38
commit 7edd912cfb
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/managers_regress/tests.py
View File

@ -66,35 +66,29 @@ class ManagersRegressionTests(TestCase):
def test_abstract_manager(self): def test_abstract_manager(self):
# Accessing the manager on an abstract model should # Accessing the manager on an abstract model should
# raise an attribute error with an appropriate message. # raise an attribute error with an appropriate message.
try:
AbstractBase3.objects.all()
self.fail('Should raise an AttributeError')
except AttributeError as e:
# This error message isn't ideal, but if the model is abstract and # This error message isn't ideal, but if the model is abstract and
# a lot of the class instantiation logic isn't invoked; if the # a lot of the class instantiation logic isn't invoked; if the
# manager is implied, then we don't get a hook to install the # manager is implied, then we don't get a hook to install the
# error-raising manager. # error-raising manager.
self.assertEqual(str(e), "type object 'AbstractBase3' has no attribute 'objects'") msg = "type object 'AbstractBase3' has no attribute 'objects'"
with self.assertRaisesMessage(AttributeError, msg):
AbstractBase3.objects.all()
def test_custom_abstract_manager(self): def test_custom_abstract_manager(self):
# Accessing the manager on an abstract model with an custom # Accessing the manager on an abstract model with an custom
# manager should raise an attribute error with an appropriate # manager should raise an attribute error with an appropriate
# message. # message.
try: msg = "Manager isn't available; AbstractBase2 is abstract"
with self.assertRaisesMessage(AttributeError, msg):
AbstractBase2.restricted.all() AbstractBase2.restricted.all()
self.fail('Should raise an AttributeError')
except AttributeError as e:
self.assertEqual(str(e), "Manager isn't available; AbstractBase2 is abstract")
def test_explicit_abstract_manager(self): def test_explicit_abstract_manager(self):
# Accessing the manager on an abstract model with an explicit # Accessing the manager on an abstract model with an explicit
# manager should raise an attribute error with an appropriate # manager should raise an attribute error with an appropriate
# message. # message.
try: msg = "Manager isn't available; AbstractBase1 is abstract"
with self.assertRaisesMessage(AttributeError, msg):
AbstractBase1.objects.all() AbstractBase1.objects.all()
self.fail('Should raise an AttributeError')
except AttributeError as e:
self.assertEqual(str(e), "Manager isn't available; AbstractBase1 is abstract")
@override_settings(TEST_SWAPPABLE_MODEL='managers_regress.Parent') @override_settings(TEST_SWAPPABLE_MODEL='managers_regress.Parent')
def test_swappable_manager(self): def test_swappable_manager(self):