summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorChris Bailey <chris.p.bailey@gmail.com>2014-02-10 05:18:20 -0500
committerTim Graham <timograham@gmail.com>2014-02-10 05:21:23 -0500
commitc5395eef7693e1ae222cbfd81d031237c1802c7f (patch)
treef0599b55b6b1c379c0641f68d5c89f1a1e9573ba /django
parent21f034165c73d6c529e2c30a69a44970537a8296 (diff)
Allowed a message to be passed to assertQuerysetEqual to make it consistent with other assert methods.
Diffstat (limited to 'django')
-rw-r--r--django/test/testcases.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 4a44a171bc..2764fc0886 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -825,17 +825,17 @@ class TransactionTestCase(SimpleTestCase):
allow_cascade=self.available_apps is not None,
inhibit_post_migrate=self.available_apps is not None)
- def assertQuerysetEqual(self, qs, values, transform=repr, ordered=True):
+ def assertQuerysetEqual(self, qs, values, transform=repr, ordered=True, msg=None):
items = six.moves.map(transform, qs)
if not ordered:
- return self.assertEqual(set(items), set(values))
+ return self.assertEqual(set(items), set(values), msg=msg)
values = list(values)
# For example qs.iterator() could be passed as qs, but it does not
# have 'ordered' attribute.
if len(values) > 1 and hasattr(qs, 'ordered') and not qs.ordered:
raise ValueError("Trying to compare non-ordered queryset "
"against more than one ordered values")
- return self.assertEqual(list(items), values)
+ return self.assertEqual(list(items), values, msg=msg)
def assertNumQueries(self, num, func=None, *args, **kwargs):
using = kwargs.pop("using", DEFAULT_DB_ALIAS)