diff options
| author | Marc Tamlyn <marc.tamlyn@gmail.com> | 2013-06-06 01:27:05 -0700 |
|---|---|---|
| committer | Marc Tamlyn <marc.tamlyn@gmail.com> | 2013-06-06 01:27:05 -0700 |
| commit | 9ed971f4f1d2f05ecf7e2760556259eb2dca85f8 (patch) | |
| tree | a980fbf9d9a9039c8cdce2e18fe0ddfb35585dda /tests/modeladmin | |
| parent | 31fd64ad8a98d7de0acb9144ae6f7bd124700cb0 (diff) | |
| parent | 0fd9f7c95f748764867dc148a2bacef807466d85 (diff) | |
Merge pull request #1245 from oinopion/list_select_related
Fixed #19080 -- Fine-grained control over select_related in admin
Diffstat (limited to 'tests/modeladmin')
| -rw-r--r-- | tests/modeladmin/tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py index 73e88024cd..805b57c070 100644 --- a/tests/modeladmin/tests.py +++ b/tests/modeladmin/tests.py @@ -1161,9 +1161,11 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_select_related = 1 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, - "'ValidationTestModelAdmin.list_select_related' should be a bool.", + "'ValidationTestModelAdmin.list_select_related' should be either a " + "bool, a tuple or a list", ValidationTestModelAdmin.validate, ValidationTestModel, ) |