summaryrefslogtreecommitdiff
path: root/tests/many_to_one/tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/many_to_one/tests.py')
-rw-r--r--tests/many_to_one/tests.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/many_to_one/tests.py b/tests/many_to_one/tests.py
index 692a3e15e4..b3028e00ca 100644
--- a/tests/many_to_one/tests.py
+++ b/tests/many_to_one/tests.py
@@ -490,17 +490,12 @@ class ManyToOneTests(TestCase):
def test_values_list_exception(self):
expected_message = "Cannot resolve keyword 'notafield' into field. Choices are: %s"
-
- self.assertRaisesMessage(FieldError,
- expected_message % ', '.join(sorted(f.name for f in Reporter._meta.get_fields())),
- Article.objects.values_list,
- 'reporter__notafield')
- self.assertRaisesMessage(
- FieldError,
- expected_message % ', '.join(['EXTRA'] + sorted(f.name for f in Article._meta.get_fields())),
- Article.objects.extra(select={'EXTRA': 'EXTRA_SELECT'}).values_list,
- 'notafield'
- )
+ reporter_fields = ', '.join(sorted(f.name for f in Reporter._meta.get_fields()))
+ with self.assertRaisesMessage(FieldError, expected_message % reporter_fields):
+ Article.objects.values_list('reporter__notafield')
+ article_fields = ', '.join(['EXTRA'] + sorted(f.name for f in Article._meta.get_fields()))
+ with self.assertRaisesMessage(FieldError, expected_message % article_fields):
+ Article.objects.extra(select={'EXTRA': 'EXTRA_SELECT'}).values_list('notafield')
def test_fk_assignment_and_related_object_cache(self):
# Tests of ForeignKey assignment and the related-object cache (see #6886).