diff options
author | Ian Kelly <ian.g.kelly@gmail.com> | 2011-03-09 19:22:27 +0000 |
---|---|---|
committer | Ian Kelly <ian.g.kelly@gmail.com> | 2011-03-09 19:22:27 +0000 |
commit | 4c152afbb6113c5f8dbd511b3548653489e3c195 (patch) | |
tree | a10ae55b2072552fad2a2b131db5ea6be1be5724 | |
parent | 1c08ca568fa83f89119d472e0b77bb088ea2f259 (diff) | |
download | django-4c152afbb6113c5f8dbd511b3548653489e3c195.tar.gz |
[1.2.X] Fixed a test that was failing in Oracle due to default ordering assumptions.
Backport of r15783 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r-- | tests/regressiontests/aggregation_regress/tests.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/regressiontests/aggregation_regress/tests.py index 44c79c36c1..3e6393e695 100644 --- a/tests/regressiontests/aggregation_regress/tests.py +++ b/tests/regressiontests/aggregation_regress/tests.py @@ -589,12 +589,12 @@ class AggregationTests(TestCase): ) publishers = Publisher.objects.filter(id__in=[1, 2]) - self.assertQuerysetEqual( - publishers, [ + self.assertEqual( + sorted(p.name for p in publishers), + [ "Apress", "Sams" - ], - lambda p: p.name + ] ) publishers = publishers.annotate(n_books=Count("book")) @@ -603,12 +603,12 @@ class AggregationTests(TestCase): 2 ) - self.assertQuerysetEqual( - publishers, [ + self.assertEqual( + sorted(p.name for p in publishers), + [ "Apress", - "Sams", - ], - lambda p: p.name + "Sams" + ] ) books = Book.objects.filter(publisher__in=publishers) @@ -620,12 +620,12 @@ class AggregationTests(TestCase): ], lambda b: b.name ) - self.assertQuerysetEqual( - publishers, [ + self.assertEqual( + sorted(p.name for p in publishers), + [ "Apress", - "Sams", - ], - lambda p: p.name + "Sams" + ] ) # Regression for 10666 - inherited fields work with annotations and |