Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed a test that was failing in Oracle due to default orderi…

…ng 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
  • Loading branch information...
commit 4c152afbb6113c5f8dbd511b3548653489e3c195 1 parent 1c08ca5
@ikelly ikelly authored
Showing with 14 additions and 14 deletions.
  1. +14 −14 tests/regressiontests/aggregation_regress/tests.py
View
28 tests/regressiontests/aggregation_regress/tests.py
@@ -589,12 +589,12 @@ def test_more_more_more(self):
)
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 @@ def test_more_more_more(self):
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 @@ def test_more_more_more(self):
],
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
Please sign in to comment.
Something went wrong with that request. Please try again.