From 4604e985aea1329e521c9cf72208d0cb77f18d60 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Thu, 15 Apr 2010 19:11:02 +0000 Subject: [PATCH] Fixed #13353: Corrected a couple of tests that were dependent on dictionary ordering. Thanks Alex. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12984 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/extra_regress/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/regressiontests/extra_regress/models.py b/tests/regressiontests/extra_regress/models.py index 1e94de0566..b68a37348c 100644 --- a/tests/regressiontests/extra_regress/models.py +++ b/tests/regressiontests/extra_regress/models.py @@ -131,12 +131,12 @@ True # only returned if they are explicitly mentioned. >>> TestObject(first='first', second='second', third='third').save() ->>> TestObject.objects.extra(select=SortedDict((('foo','first'),('bar','second'),('whiz','third')))).values() -[{'bar': u'second', 'third': u'third', 'second': u'second', 'whiz': u'third', 'foo': u'first', 'id': 1, 'first': u'first'}] +>>> list(TestObject.objects.extra(select=SortedDict((('foo','first'),('bar','second'),('whiz','third')))).values()) == [{'bar': u'second', 'third': u'third', 'second': u'second', 'whiz': u'third', 'foo': u'first', 'id': 1, 'first': u'first'}] +True # Extra clauses after an empty values clause are still included ->>> TestObject.objects.values().extra(select=SortedDict((('foo','first'),('bar','second'),('whiz','third')))) -[{'bar': u'second', 'third': u'third', 'second': u'second', 'whiz': u'third', 'foo': u'first', 'id': 1, 'first': u'first'}] +>>> list(TestObject.objects.values().extra(select=SortedDict((('foo','first'),('bar','second'),('whiz','third'))))) == [{'bar': u'second', 'third': u'third', 'second': u'second', 'whiz': u'third', 'foo': u'first', 'id': 1, 'first': u'first'}] +True # Extra columns are ignored if not mentioned in the values() clause >>> TestObject.objects.extra(select=SortedDict((('foo','first'),('bar','second'),('whiz','third')))).values('first', 'second')