Commit 4c152afb authored by Ian Kelly's avatar Ian Kelly
Browse files

[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
parent 1c08ca56

tests/regressiontests/aggregation_regress/tests.py

+14 −14
Original line number Diff line number Diff line
@@ -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