diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2015-07-02 18:42:24 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-07-02 14:18:10 -0400 |
| commit | 61f3e22e38516d8284a45e2b2792a61d541f9e78 (patch) | |
| tree | 874bf0d59a88d35200283f6437ea5669c8ed10d5 /tests/managers_regress | |
| parent | 30a152a367541a0b815ab84b3da407700feff744 (diff) | |
| download | django-61f3e22e38516d8284a45e2b2792a61d541f9e78.tar.gz | |
Fixed #25054 -- Added app_label to swapped model AttributeError
Diffstat (limited to 'tests/managers_regress')
| -rw-r--r-- | tests/managers_regress/tests.py | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/tests/managers_regress/tests.py b/tests/managers_regress/tests.py index 6f70314cb7..c83c40055f 100644 --- a/tests/managers_regress/tests.py +++ b/tests/managers_regress/tests.py @@ -109,12 +109,12 @@ class ManagersRegressionTests(TestCase): # Accessing the manager on a swappable model should # raise an attribute error with a helpful message - try: + msg = ( + "Manager isn't available; 'managers_regress.SwappableModel' " + "has been swapped for 'managers_regress.Parent'" + ) + with self.assertRaisesMessage(AttributeError, msg): SwappableModel.objects.all() - self.fail('Should raise an AttributeError') - except AttributeError as e: - self.assertEqual(str(e), "Manager isn't available; SwappableModel has been swapped for 'managers_regress.Parent'") - finally: apps.app_configs['managers_regress'].models = _old_models apps.all_models['managers_regress'] = _old_models @@ -128,7 +128,6 @@ class ManagersRegressionTests(TestCase): try: class SwappableModel(models.Model): - stuff = models.Manager() class Meta: @@ -137,12 +136,12 @@ class ManagersRegressionTests(TestCase): # Accessing the manager on a swappable model with an # explicit manager should raise an attribute error with a # helpful message - try: + msg = ( + "Manager isn't available; 'managers_regress.SwappableModel' " + "has been swapped for 'managers_regress.Parent'" + ) + with self.assertRaisesMessage(AttributeError, msg): SwappableModel.stuff.all() - self.fail('Should raise an AttributeError') - except AttributeError as e: - self.assertEqual(str(e), "Manager isn't available; SwappableModel has been swapped for 'managers_regress.Parent'") - finally: apps.app_configs['managers_regress'].models = _old_models apps.all_models['managers_regress'] = _old_models @@ -156,7 +155,6 @@ class ManagersRegressionTests(TestCase): try: class SwappableModel(models.Model): - objects = models.Manager() class Meta: @@ -165,12 +163,12 @@ class ManagersRegressionTests(TestCase): # Accessing the manager on a swappable model with an # explicit manager should raise an attribute error with a # helpful message - try: + msg = ( + "Manager isn't available; 'managers_regress.SwappableModel' " + "has been swapped for 'managers_regress.Parent'" + ) + with self.assertRaisesMessage(AttributeError, msg): SwappableModel.objects.all() - self.fail('Should raise an AttributeError') - except AttributeError as e: - self.assertEqual(str(e), "Manager isn't available; SwappableModel has been swapped for 'managers_regress.Parent'") - finally: apps.app_configs['managers_regress'].models = _old_models apps.all_models['managers_regress'] = _old_models |