summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2019-11-18 06:32:37 -0500
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-11-18 12:32:37 +0100
commit9100c664db5cca7512947e23d588cfcb937a7a92 (patch)
tree18a97cf4d7d137bf492f78c592df5839d9e8d08f
parent5e2839f3207a02c05b96d761b2441d1ef4d920d4 (diff)
Relaxed some query ordering assertions in tests.
It accounts for differences seen on cockroachdb.
-rw-r--r--tests/aggregation/tests.py2
-rw-r--r--tests/annotations/tests.py2
-rw-r--r--tests/expressions_window/tests.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py
index 0f799c4bc3..a93c39e3d5 100644
--- a/tests/aggregation/tests.py
+++ b/tests/aggregation/tests.py
@@ -440,7 +440,7 @@ class AggregateTestCase(TestCase):
def test_fkey_aggregate(self):
explicit = list(Author.objects.annotate(Count('book__id')))
implicit = list(Author.objects.annotate(Count('book')))
- self.assertEqual(explicit, implicit)
+ self.assertCountEqual(explicit, implicit)
def test_annotate_ordering(self):
books = Book.objects.values('rating').annotate(oldest=Max('authors__age')).order_by('oldest', 'rating')
diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py
index c39e8d3fbe..db4413564c 100644
--- a/tests/annotations/tests.py
+++ b/tests/annotations/tests.py
@@ -209,7 +209,7 @@ class NonAggregateAnnotationTestCase(TestCase):
lengths = Employee.objects.annotate(
name_len=Length('first_name'),
).distinct('name_len').values_list('name_len', flat=True)
- self.assertSequenceEqual(lengths, [3, 7, 8])
+ self.assertCountEqual(lengths, [3, 7, 8])
def test_filter_annotation(self):
books = Book.objects.annotate(
diff --git a/tests/expressions_window/tests.py b/tests/expressions_window/tests.py
index 8102ffe621..580d038e29 100644
--- a/tests/expressions_window/tests.py
+++ b/tests/expressions_window/tests.py
@@ -699,7 +699,7 @@ class WindowFunctionTests(TestCase):
highest=Window(FirstValue('id'), partition_by=F('department'), order_by=F('salary').desc())
).values('highest')
highest_salary = Employee.objects.filter(pk__in=subquery_qs)
- self.assertSequenceEqual(highest_salary.values('department', 'salary'), [
+ self.assertCountEqual(highest_salary.values('department', 'salary'), [
{'department': 'Accounting', 'salary': 50000},
{'department': 'Sales', 'salary': 55000},
{'department': 'Marketing', 'salary': 40000},